stuff
Merge branch 'master' of https://github.com/pharsydeone/oms

Conflicts:
	OMS/index.php
	OMS/style.css
Merge branch 'master' of https://github.com/pharsydeone/oms
Friday at 5