Removed whitespace in JoshTest.txt
Merge branch 'coolFeature'