egypt oh fuck 17 mins left
Merge branch 'master' of https://github.com/chriscarroll/A-Kittens-Creed

Conflicts:
	data/egypt.tmx

AHHHHHHHHHHHHHHHHHHHHHHHHH