one timer
Merge branch 'master' of https://github.com/scottk92/chalkwalk
Merge branch 'master' of https://github.com/scottk92/chalkwalk
include fb
Merge branch 'master' of https://github.com/scottk92/chalkwalk

Conflicts:
	views/index.html
junk coords
Merge branch 'master' of https://github.com/scottk92/chalkwalk

Conflicts:
	views/index.html