Towers fire on each other
Merge branch 'master' of https://github.com/ruphin/Placeholder

Conflicts:
	todo.txt