Butter armory
Merge branch 'master' of https://github.com/JGScruggs91/test

Conflicts:
	armory.txt