Initial push
commit gitignore
Merge branch 'master' of https://github.com/DaveWelling/Novel

Conflicts:
	.gitignore