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

Conflicts:
	lab4/js/get.js
	lab4/lab5.html
no message
Merge branch 'master' of https://github.com/EvertLagerberg/mopub14_lab1

Conflicts:
	lab4/js/add.js
	lab4/lab5.html
no message