added comments for our location section
resolved merge conflicts
Ping Pong break
Resolve conflicts
First media query working with Neat
basic form created
Responsive layout and Flickr layout
Style tabs
added datepicker to form
resolved main scss conflict
Added hero image
Merge branch 'dev' into Richard
Added type to hero
resolved html conflict
Specials