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