Commit merge error.
Merge origin/master

Conflicts:
	src/me/StevenLawson/TotalFreedomMod/Commands/Command_verify.java