Commit before pull
Merge branch 'master' of https://github.com/arcticmicho/moon2

Conflicts:
	Assets/-tk2d.asset.meta
	Assets/Scripts/Parallax.cs.meta
	Assets/Scripts/tk2dTileMapDemoFollowCam.cs
Added basic AI