befor implement cycling
version 0.1
base functional
Merge branch 'master' of https://github.com/VVhiteCoder/smp

Conflicts:
	templates/base.html