Hopefully no merge conflict......

oh dear god no please no
Merge branch 'master' of https://github.com/kag0/BiRiTracker

Conflicts:
	src/com/blackdoor/biritracker/FollowerActivity.java
	src/com/blackdoor/biritracker/LeaderActivity.java