app js
gem update
Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts:
	app/assets/javascripts/application.js
merge app js
gemlock
Merge branch 'master' of github.com:fetsite/fetsite

Conflicts:
	Gemfile.lock