Test change
Merge branch 'master' of https://github.com/jquesnelle/penguicontrax
Event form: Added more link and removed redundant options
grunt,bower,npm, less integration
bootstrap
bootstrap
stealconfig
Fixed where for issue #21
Merge branch 'master' of https://github.com/MattArnold/penguicontrax
bootstrap added to events page
gruntfile
Merged base.html
Merge remote-tracking branch 'origin/master' into sandcat

Conflicts:
	penguicontrax/templates/base.html
Merge branch 'sandcat' of github.com:MattArnold/penguicontrax into sandcat

Conflicts:
	penguicontrax/templates/base.html
cleanup macro, remove old stylesheet for now
Formatted event form a bit using bootstrap
events pages changes
Merge remote-tracking branch 'origin/master' into sandcat

Conflicts:
	penguicontrax/static/submissionform.js
	penguicontrax/templates/form.html
	penguicontrax/templates/index.html
	penguicontrax/templates/macros.html
Resolved conflicts with form.html
conflict resolution