Updating Navigation
Let's see if this worked..

Tried some things to fix the detached head issue...
Updating Navigation
Merge branch 'master' of https://github.com/heathj/Rideboard

Conflicts:
	App/bin/classes/rideboard/project/space/EditProfile$1.class
	App/bin/classes/rideboard/project/space/EditProfile.class
	App/bin/classes/rideboard/project/space/Help.class
	App/bin/classes/rideboard/project/space/Login.class
	App/bin/classes/rideboard/project/space/R$id.class