Initial commit
Merge branch 'master' of github.com:joshmcarthur/dogbook

Conflicts:
	.gitignore