The cake is a lie
Merge branch 'master' of github.com:PrototypeAlex/mental-order

Conflicts:
	app/assets/images/small-scared.png
	app/views/parent_mailer/status_alert_sad_email.html.erb