sharing.
Merge branch 'master' of github.com:soad003/flatman

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/config/config.js
	config/routes.rb
try.