modify controller
Merge branch 'master' of https://github.com/stankud/planetary_defender
"Does not break anymore when user isnt in db"
Merge branch 'master' of https://github.com/stankud/planetary_defender

Conflicts:
	config/database.yml