Lab 2 Finished
Merge remote-tracking branch 'origin/master'

Conflicts:
	Lab2/incl/header.php
	Lab2/report.php
	Lab2/viewsource.php