Chnages to the login.html
Merge branch 'master' of https://github.com/HipTraveler/Dev-UX

Conflicts:
	login.html
Fised the login.html page
Committed changes to main test/nav_test.html
Making a new homepage
Finishing a home page
SOme changes to the homepage