committing to catch up with master
Merge branch 'master' of https://github.com/slightlydeviant/bowlgames

Conflicts:
	bowlpicks.sqlite3
	picks/views.pyc
	templates/base.html