post login
Merge branch 'master' of https://github.com/4acertijos/safe_trails

Conflicts:
	css/main.css