images fixed?
Merge branch 'master' of https://github.com/MichaelUy627/WebAppAM

Conflicts:
	app/views/login.html