Created tables for Event, event_time, phase, phase_event
create controller for home and event and updated the routes file
create homepage, create_survery page, and view folders
create homepage, create_survery page, and view folders
merge conflicts
fixed plural problems
fixed all specs
Removed two bad migrations
removed extraneous model
added haml and added phase controller
phase functionality online
Really basic styling for header/nav in sass
Updated James's HAML to reflect styling changes on erb
Added capybara to the gemfile and spec helper, basic homepage tests for welcome text and root link
added devise login links
Fixed right hand nav CSS
Changed nav font, fixed CSS error for right nav
Haml conflicts, 1 spelling error
Added flash[:notice] to layout... not sure if catches flash[:error]
Added silly vertical lines to the header