tweaks in create event form
more tweaks on create event form
Merge branch 'master' of github.com:willhall88/Angry-Kitty into websteps
added templates to all emails
Merge branch 'master' of github.com:willhall88/Angry-Kitty
Merge branch 'master' of github.com:willhall88/Angry-Kitty
working on the dashboard design
passing all cucumber tests
Merge branch 'master' of github.com:willhall88/Angry-Kitty
Merge branch 'master' of https://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
Merge branch 'master' of https://github.com/willhall88/Angry-Kitty into will-bootstrap-to-merge
Merge branch 'will-bootstrap-to-merge'
fixed all failing rspec tests- only one twilio test fails right now. two pending cucumber tests to sort. ALL GREEN.
cleaned up all the pending and remaining failed tests. ALL GREEN, twilio still failing