sql returns bomber
local
init
blah
Merge origin/master

Conflicts:
	src/main/java/SQL/SQLHandler.java
ADD GCM
Merge origin/master
a
gcm done