tried to fix timeslot validation within event time (julie work)
fixed merge conflicts in models and event controller
added stylesheets and simpleform work
deleted datetimepicker
added threading and more refactoring to event.rb
added normalize-css
added vertical timeline html, css, and javascript (but not modernizr.js yet)
added modernizr gem
added timeline icon images and modified paths in html to find them
got timeline to left and blocks on right
content taking up more width of page
changed application.css to SASS using bourbon and neat
fixed date positioning
further styling of events show page
finally figured out how to work with neat
fixed merge confict in event.rb
images now show on hover of associated tweet
overflow tweets scroll, aligned top of tweets with top of picture
bottom of tweet list aligned with bottom of picture
dispalyed start time in eastern time on the show page