Fix email
Merge branch 'master' of https://github.com/AFusco/Artisan

Conflicts:
	bootstrap_template/index.html