Added implementation of Timer
Added timer functionality to Game
Added a timer to weapon
Merge branch 'firingFeature' of https://github.com/Jokab/Bullet-Inferno into firingFeature
Resolved merge conflicts
Merge branch 'development' into coreTests

Conflicts:
	Bullet-Inferno/src/se/dat255/bulletinferno/model/PlayerShipImpl.java
Starting to update tests to use the new Timer interface.