random changes

Random changes
Merge branch 'master' of https://github.com/TomoWalk/WorkOnWalk

Conflicts:
	templates/walk.html
Cool changes guys

cool changes
Merge branch 'master' of https://github.com/TomoWalk/WorkOnWalk