Commit!
Merge branch 'master' of https://github.com/Jam-Craft/LASER

Conflicts:
	src/main/java/net/jamcraft/lasermod/Lasers.java