shit
fixed controllers
Merge branch 'Eduardo' of https://github.com/4acertijos/safe_trails into Eduardo

Conflicts:
	js/app.js
	js/controllers.js
	partials/login.html