initial
Merge branch 'master' of github.com:paulruescher/ember-rails-app