no message
Merge branch 'master' of https://github.com/EvertLagerberg/mopub14_lab1

Conflicts:
	lab2/lab2.html
Merge branch 'master' of https://github.com/EvertLagerberg/mopub14_lab1
no message
Merge branch 'master' of https://github.com/EvertLagerberg/mopub14_lab1

Conflicts:
	lab2/lab2.html
no message