exam prep in progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	Exam-Preparations/31August2014/SemanticHTML.php