todo
Merge branch 'master' of https://github.com/ruphin/Placeholder

Conflicts:
	todo.txt
Click on mini map, enemy targetting changed
Merge branch 'master' of https://github.com/ruphin/Placeholder