Merge branch 'master' of https://github.com/1d20/softcycle

Conflicts:
	frontend/templates/home/index.html
Strange pycharm
merged