Reset head to counter commit that would override current build
Merge branch 'master' of https://github.com/OneGoodEngineer/dynamicEmail

Conflicts:
	client/app.css
	client/index.html