diff --git a/.gitignore b/.gitignore
index 4ef0a06d..1ecdf4b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,12 @@
*DS_STORE
-/Gemfile.lock
\ No newline at end of file
+/Gemfile.lock
+templates/TestTemplate.txt.orig
+templates/TestTemplate.txt.BACKUP.1944.txt
+templates/TestTemplate.txt.BASE.1944.txt
+templates/TestTemplate.txt.LOCAL.1944.txt
+templates/TestTemplate.txt.REMOTE.1944.txt
+index.html.BACKUP.1392.html
+index.html.BASE.1392.html
+index.html.LOCAL.1392.html
+index.html.orig
+index.html.REMOTE.1392.html
diff --git a/index.html b/index.html
new file mode 100644
index 00000000..b9aa1c4f
--- /dev/null
+++ b/index.html
@@ -0,0 +1,12 @@
+
+
+My NEW WEBSITE
+
+MyTitle
+
+This is my first commit
+
+
+
+
+
\ No newline at end of file
diff --git a/javascripts/batman.js b/javascripts/batman.js
index 2619c942..43fbdefd 100644
--- a/javascripts/batman.js
+++ b/javascripts/batman.js
@@ -1,5 +1,5 @@
(function() {
- var Batman, __slice = [].slice;
+ var Robin, __slice = [].slice;
Batman = function() {
var mixins;
@@ -13,9 +13,9 @@
})(Batman.Object, mixins, function() {});
};
- Batman.version = '0.14.1';
+ Batman.version = '0.15.1';
- Batman.config = {
+ Robin.config= {
pathPrefix: '/',
viewPrefix: 'views',
fetchRemoteViews: true,
@@ -23,9 +23,9 @@
minificationErrors: true
};
- (Batman.container = (function() {
+ (Robin.container = (function() {
return this;
- })()).Batman = Batman;
+ })()).Robin = Batman;
if (typeof define === 'function') {
define('batman', [], function() {
diff --git a/javascripts/es5-shim.js b/javascripts/es5-shim.js
index ce79780f..b04d7022 100644
--- a/javascripts/es5-shim.js
+++ b/javascripts/es5-shim.js
@@ -1,4 +1,4 @@
-// vim: ts=4 sts=4 sw=4 expandtab
+// vim: ts=4 sts=4 sw=4 expandtab
// -- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
// -- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
@@ -29,7 +29,7 @@
// RequireJS
if (typeof define == "function") {
define(definition);
- // CommonJS and