added basic bluetooth stuff
added basic bluetooth stuff
third try
resolution
Merge branch 'master' of https://github.com/wassonan/hackrujava into wassonan

Conflicts:
	.classpath