Merge branch 'master' of https://github.com/ronreiter/webserverlab

Conflicts:
	Lab2/2013-01-06.txt
Merge remote-tracking branch 'origin/master'