Updated GEM
Merge branch 'master' of https://github.com/nyneaxis/first_app_rails

Conflicts:
	Gemfile
Updated GEM