committing
Merge remote-tracking branch 'origin/master'

Conflicts:
	galaga/urls.py
	templates/base.html