windows machine changes- anything new?????
Merge branch 'master' of https://github.com/Bradshaw/froglick

Conflicts:
	src/AnAL.lua
	src/Animation.lua
	src/Enemy.lua
	src/EnemyBody.lua
	src/EnemyWeapon.lua
	src/Spaceman.lua
	src/TileGrid.lua
	src/Zether.lua
	src/conf.lua
	src/main.lua