Added some docstrings
Merge branch 'master' of github.com:aacoppa/inglorious-gangsters

Conflicts:
	app.py