Fixed the navigation links
Merge branch 'develop' of https://github.com/phoenixnebula/UIProject into develop

Conflicts:
	index.html
Fixed the merge conflicts