test commit3
Merge branch 'master' of https://github.com/uskey512/UnityChanGameJam2014

Conflicts:
	Assets/GameJam/Enemy.meta