Initial commit
Added test.txt
Merge branch 'master' of https://github.com/Jolleyboy/cs246

Conflicts:
	README.md