merging
fixed merge conflict
Merge branch master of github.com:willhall88/Angry-Kitty
made some more changes to the event title and timer
started adding flatify buttons.also trying to user stripe button on event page
readded some logic on the show page
Merge branch 'master' of github.com:willhall88/Angry-Kitty
added more css and worked on some of the status buttons
changed the kitty title to an image rather than text
 changed the scheduler to be very angry not really angry
edited scheduler spec to ensure event is created properly
Merge branch 'show-event-bootstrap' of github.com:willhall88/Angry-Kitty
added a delete button to the event page
Merge branch 'master' of github.com:willhall88/Angry-Kitty