grr
Merge branch 'master' of https://github.com/howpez/ludum-dare-2013-12

Conflicts:
	project/Library/CurrentLayout.dwlt
	project/Library/assetDatabase3
Merge branch 'master' of https://github.com/howpez/ludum-dare-2013-12
adding basic enemy
Merge branch 'master' of https://github.com/howpez/ludum-dare-2013-12
Merge branch 'howard-1.00'