Update SchoolView.java
Update MainActivity.java
Merge remote-tracking branch 'XavierGroupProject/master'