added to edit user details page
Merge branch 'signup' of github.com:willhall88/Angry-Kitty into moreforms
ordered event page to correctly show users and invitees
sorting out failing cucumber tests, modal related tests failing
Merge branch master of github.com:willhall88/Angry-Kitty into show-event
Merge branch moreforms of github.com:willhall88/Angry-Kitty into show-event
nailed all the cuc tests GREEEEEEEEN
Merge branch 'moreforms'
all tests passing for reals now. couple randomly fail but nothing to worry about. GREEEEEEN.
added some css to the show event page.
Merge branch 'master' of https://github.com/willhall88/Angry-Kitty
Merge branch 'master' of github.com:willhall88/Angry-Kitty into bootstrap

Conflicts:
	app/assets/stylesheets/application.css.scss
Merge branch 'bootstrap' of github.com:willhall88/Angry-Kitty into bootstrap

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/events/new.html.erb