adding worlds
Merge branch 'master' into ryan
Merge branch 'master' of https://github.com/TerranceN/GGJ2014.git into ryan

Conflicts:
	src/ata/Entity.as
	src/ata/GameLogic.as
	src/ata/Level.as
	src/ata/Player.as
Merge branch 'master' of https://github.com/TerranceN/GGJ2014.git into ryan

Conflicts:
	src/ata/Entity.as
	src/ata/Player.as
multi displays on objects
Merge branch 'master' of https://github.com/TerranceN/GGJ2014.git into ryan

Conflicts:
	src/ata/Player.as