shot och tower
Merge branch 'master' of https://github.com/poner538/WLTSO

Conflicts:
	Tower/Shot.cc
	Tower/Shot.h
	Tower/Tower.h