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

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