added templates to all emails
Merge branch 'master' of github.com:willhall88/Angry-Kitty
working on the dashboard design
Merge branch 'master' of github.com:willhall88/Angry-Kitty
styled the dashboard to a better level, using purple accents
sroop eagle eyes sunar made this fix happen, one new error in cucumber remains
all emails now working, all green, thanks to mighty wizard Alex
Merge branch 'tuesday'

Conflicts:
	app/assets/stylesheets/application.css.scss
fixed a padding issue with the progress bar
fixed event panel heading color for better contrast
fixed merge issue in application.css