Switched back to NullPointerException
Merge branch 'master' of https://github.com/ccox40/Thing42

Conflicts:
	src/Thing42.java