dding
sadjlkdjsl
Merge branch 'master' of https://github.com/polyatail/devgood

Conflicts:
	registration/login.html
Merge branch 'master' of https://github.com/polyatail/devgood

Conflicts:
	registration/login.html