Gotta commit this. Can't remember what I changed. It's not much

Die.

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

Conflicts:
	bin/classes/com/nick/nusbuddy/R$drawable.class
	bin/classes/com/nick/nusbuddy/R$id.class
	bin/classes/com/nick/nusbuddy/R$layout.class
	bin/classes/com/nick/nusbuddy/R$menu.class
	bin/classes/com/nick/nusbuddy/R$string.class
	bin/classes/com/nick/nusbuddy/R$style.class
	gen/com/nick/nusbuddy/R.java
Tidied up some xml files and implemented the splash screen for login.

Fixed some small errors in the xml files for announcement, gradebook, and
finals. Tried to convert to listview, but unable to make the listview act
like a non-scrollable layout. Also the splash screen is just hiding the
login fields and showing the progress bar while logging in.

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