Add angularjs gem
Adjust database.yml
Clean up
Merge branch 'master' of github.com:aschmi/feats

Conflicts:
	Gemfile