100%(?) shell done
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/Game.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
server 2
Laser 1
Laser 1
Laser 1