updated navbar for main page
Merge pull request #3 from kazuuchikata/master

updated navbar for main page
fixed tiny issue with password field in login.html
Merge pull request #4 from kazuuchikata/master

fixed tiny issue with password field in login.html
Merge remote-tracking branch 'upstream/master'

Conflicts:
	login.html
fixed login.html merge issue