added a file for testing
oh well
Merge branch 'master' of https://github.com/ScottWachal/SD13GroupProject

Conflicts:
	Documentation/README.md
Merge branch 'master' of https://github.com/ScottWachal/SD13GroupProject
Merge branch 'master' of https://github.com/ScottWachal/SD13GroupProject