I have a dot that moves
Woot, layout from Jon
Merge branch 'deckofpandas'
Merge branch 'Jon'

Conflicts:
	wherethedocareyou/templates/layout.html