conflict resolution
Merge branch 'sandcat' of github.com:MattArnold/penguicontrax into sandcat

Conflicts:
	penguicontrax/templates/form.html
merge