form
Merge branch 'master' of https://github.com/salazarm/AngelHackVoiceReminders

Conflicts:
	app/views/home/_main.html.erb
Merge branch 'master' of https://github.com/salazarm/AngelHackVoiceReminders
devise
wefwef