Initial commit
Resolve merge conflict
WIP:  without ember-rails
Ember-rails and Twitter Bootstrap incorporated