pet bowls!
Merge branch 'master' of https://github.com/rit-somethings-wrong/somethings-wrong
more stuff andy tidying
Merge branch 'master' of https://github.com/rit-somethings-wrong/somethings-wrong

Conflicts:
	SomethingsWrong/SomethingsWrong/assets/outdated_not needed/Hotel__.gif
	SomethingsWrong/SomethingsWrong/assets/outdated_not needed/inside-airport.png