Git ignore test
Another gitignore
Hopefully the last commit with unneed files in it.
Merge branch 'master' of https://github.com/spudmonkey/CISP-1020
Merge branch 'master' of https://github.com/spudmonkey/CISP-1020

Conflicts:
	.gitignore