Renaming
Merge branch 'master' of https://github.com/cmester0/Xamplicity.git

Conflicts:
	src/cmester/xamplicity/items/XamplicityItems.java
	src/cmester/xamplicity/reference/Names.java