test if update from PHP mode works
re-set medialap01 repo
Merge branch 'master' of https://github.com/mbrick02/danielsmtn
Merge branch 'master' of https://github.com/mbrick02/danielsmtn.git
update from laptop
laptop cleanup
Merge branch 'master' of https://github.com/mbrick02/danielsmtn

Conflicts:
	includes/form.php
	public/admin/editDMAdmin.php