derp
Merge branch 'master' of https://github.com/urthbound/sample_app

Conflicts:
	app/models/user.rb
	db/schema.rb