kbjn
Merge branch 'master' of
https://github.com/EvertLagerberg/mopub_project.git

Conflicts:
	intprog_project/src/controller/connectDB.java