some work on project
Merge branch 'master' of https://github.com/CjBuresch/nplus1

Conflicts:
	.gitignore