Removing IDE Dependencies
gitignore
Removing IDE Dependencies
Merge branch 'master' of https://github.com/jeremybeardsley/cs407FinalProject
Merge branch 'master' of https://github.com/jeremybeardsley/cs407FinalProject

Conflicts:
	.gitignore
	nbproject/private/private.properties
Merge branch 'master' of https://github.com/jeremybeardsley/cs407FinalProject
Adding DPDoc into doc folder