migrate db
create user model
resolve merge conflict
add user mvc and spec directories
add bower-rails and angular-rails-templates
config routes.rb
attach Angular to Rails