Environment files
Merge branch 'master' of github.com:rainforestapp/GitSatisfaction
Merge branch 'master' of github.com:rainforestapp/GitSatisfaction

Conflicts:
	server.py