#37
Merge branch 'master' of https://github.com/everygym/everygym

Conflicts:
	templates/everygym/css/template.css