Google Map and css changes
Google Map and css changes
pushing
finishing aside
Merge branch 'mobile'

Conflicts:
	.DS_Store
	app/.DS_Store
	app/styles/main.scss
removed .DS_Store from folders
Fixed mobile layout of map and social media nav
Merge branch 'master' of https://github.com/tiy-durham-june2014-frontend/team-orange
more changes
Changes to CSS
Merge branch 'master' of github.com:tiy-durham-june2014-frontend/team-orange
Fixed Widths
Merge branch 'mobile'
Merge branch 'master' of https://github.com/tiy-durham-june2014-frontend/team-orange
Javascript stuff. Added local storage