added roundabout
Merge branch 'roundabout'
roundabout :)
footer nav bar with active state
changed links preference screens
demo for icon fonts
travel details screen
Merge branch 'master' of https://github.com/AGPDevelopment/ShouldIRun
Merge branch 'Rianne'

Conflicts:
	css/style.css
	font-demo/demo-files/demo.css
	font-demo/demo-files/demo.js
preference screen
no message
Merge branch 'master' of https://github.com/AGPDevelopment/ShouldIRun
style fixes
Preference screens finished (added page-specific css)
Merge branch 'master' into Rianne