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

Conflicts:
	Maps.manifest
no message