committing
asdf
resolve
Merge branch 'master' of github.com:moormanm/asdf

Conflicts:
	admin/index.php
adding work