get testing working
Merge branch 'master' of https://github.com/matkat99/dlap

Conflicts:
	app/scripts/controllers/dlap.js
merge conflicts