Backbone homepage
gemfile.lock conflict resolution
Merge pull request #6 from JoshuaNotowitz/master

backbone homepage simple