Login Modal and Register Modal
Merge branch 'master' of https://github.com/alin72/CSE-308

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	src/main/index.html
	src/main/login.html
Finalized 3rd party site