Added lightsaber feature
Fixed bug
Made slight modification to lightsaber
Merge branch 'lightsaber_feature'

Conflicts:
	TestEclipseProject/TestProject/src/JustATest.java
Another bug fix