Merge branch 'master' of https://github.com/neilfordyce/CycleSafe

Conflicts:
	bin/classes/com/example/cyclesafe/ServiceServer.class
	src/com/example/cyclesafe/ServiceServer.java
Removed unneccessary code and cleaned up
Cleaned up code