I can't undo the commit

Ignore this
Merge branch 'master' of https://github.com/Code-n-Chainsaws/Iron-Throne

Conflicts:
	README.txt