stupid apk changed

Signed-off-by: nicholaslum444 <nicholaslum444@hotmail.com>
Merge branch 'master' of https://github.com/nicholaslum444/NUSBuddy.git

Conflicts:
	bin/NUSBuddy.apk

Signed-off-by: nicholaslum444 <nicholaslum444@hotmail.com>