checkpoint so we can merge daves upstream changes
Merge branch 'master' of github.com:bellycard/doghouse

Conflicts:
	views/layout.jade
basic CRUD functionality for events
Merge branch 'master' of github.com:bellycard/doghouse
Merge branch 'master' of github.com:bellycard/doghouse
fixing bad merge
Merge pull request #9 from craigulliott/master

v1 basic crud functions, with an event model