updates
Merge branch 'master' of https://github.com/chrishulton/whackmole

Conflicts:
	whackmole/urls.pyc
	whackmole/views.pyc