speed as Vector2, key constants as uint
adding camera controls
add mask
Merge branch 'master' of https://github.com/TerranceN/GGJ2014.git into ryan
player art in fla and swc
add update camera function
moved player to separate fla
Merge branch 'master' of https://github.com/TerranceN/GGJ2014.git
Merge branch 'master' of https://github.com/TerranceN/GGJ2014.git
Merge branch 'collision'

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

Conflicts:
	src/ata/GameLogic.as
player image
refactor to x and y
Merge branch 'master' of https://github.com/TerranceN/GGJ2014.git into ryan

Conflicts:
	src/ata/Entity.as
smooth camera
Merge branch 'ryan'
changed fixed update timestep size
Merge branch 'collision'

Conflicts:
	src/ata/Entity.as
	src/ata/GameLogic.as
	src/ata/Level.as
	src/ata/Player.as
	src/ata/Vector2.as
player.fla
adding worlds