yay
2
NO ONE CARES
Merge branch 'master' of https://github.com/sbuchele/kradar

Conflicts:
	Kradar/bin/classes/com/example/kradar/MainActivity.class