Documentation update
Merge branch 'master' of https://github.com/bogatabeav/cmsc495project

Conflicts:
	header.php
	mobileTimeline.php