Changed Nav & Trip Planner
Merge branch 'master' of https://github.com/AppFace2014/Carbon_Tracker

Conflicts:
	CSS/style.css
	index.html
Merge branch 'master' of https://github.com/AppFace2014/Carbon_Tracker