bo0o0o
Merge branch 'master' of https://github.com/emmachristie/projcode

Conflicts:
	getInShape copy/letsplay!/Gemfile.lock
	getInShape copy/letsplay!/app/models/user.rb
lol