ugvjh
Brrp brrp
Herp
Merge branch 'master' of https://github.com/sbuchele/kradar

Conflicts:
	Kradar/src/com/example/kradar/MainActivity.java
SPINSPINSPIN
Location Services
Merge branch 'master' of https://github.com/sbuchele/kradar