Continued building calendar
Added GridView for Twitter, announcements, library, and NHS pages
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	app/src/main/java/com/grandblanchs/gbhs/twitter.java