Initial commit
Adding .gitignore
Merge branch 'master' of https://github.com/ColCarroll/book_journal

Conflicts:
	.gitignore