Update campus view controller

-html files displaying properly
Merge branch 'master' of https://github.com/ThePenguin1140/NSO-App

Conflicts:
	NSO-App/AppDelegate.m
test commit

test