Finished top bar
Merge branch 'master' of https://github.com/FutureStop/where-to-stop

Conflicts:
	FutureStop.xcodeproj/project.pbxproj
	FutureStop/FSRightScreenViewController.m
	FutureStop/Screens/FSLeftScreenViewController.m