initial commit
Merge branch 'master' of github.com:jstaffans/dropbook

Conflicts:
	.gitignore