Commiting from the original Oh Noes
Merge branch 'master' of https://github.com/paranhaslett/SmudgeCleanTest

sorting out the conflicts
Conflicts:
	src/TestFile