estifine changes
Merge branch 'master' of https://github.com/bradynpoulsen/alveywall

Conflicts:
	estefine/login.html