edited files to add angular to rails environment
modified gemfile
fixed merge conflicts
Merge pull request #5 from zelzel2315/angular

edited files to add angular to rails environment