Marcella's commit
Merge branch 'master' of https://github.com/thejewellster/open-campus-app

Conflicts:
	blog.html
	css/style.css
	index.html