Merge branch 'master' of https://github.com/johnjun/DM2518-Project

Conflicts:
	js/controllers/example1Controller.js