pushed a lot of bugs
Merge branch 'master' of https://github.com/keating/future_cadre

Conflicts:
	app/models/profile.rb