this is dumb
Merge branch 'master' of https://github.com/ckhajavi/MI5

Conflicts:
	VDMS.pro.user