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

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

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

Conflicts:
	lab2/lab2.html
	lab4/js/add.js