Initial commit
added users
Merge branch 'master' of https://github.com/sskates1/task_galaxy

Conflicts:
	config/secrets.yml