craig doing work
craig trying again

Merge branch 'master' of github.com:D-Scaduto/test-repo

Conflicts:
	admin.php
	deskfm/dastyle.css
	deskfm/dbase/dfm_dbadd.php
	deskfm/dbase/dfm_dbdel.php
	deskfm/dbase/dfm_dbget.php
	deskfm/dbase/dfm_dbrand.php
	deskfm/dbase/dfm_getone.php
	deskfm/dbase/dfm_people.php
	deskfm/dbase/get_products.php
	deskfm/dbase/get_providers.php
	deskfm/dbase/get_unsorted.php
	deskfm/dbase/update_person.php
	deskfm/dbase/update_product.php
	deskfm/dbase/update_webit.php
	deskfm/model.js
	deskfm/namer.js
	deskfm/rail.js
	deskfm/sharer.js
	deskfm/stater.js
	deskfm/unitview/grouper.js
	deskfm/unitview/poster.js
	deskfm/unitview/rung.js
	deskfm/viewer.js