Fixed Login Register
Merge branch 'master' of https://github.com/aaronnech/waterproject

Conflicts:
	src/app/index.html