initial commit
Merge branch 'master' of github.com:aofficer/umd_dev
Revert "Merge branch 'master' of github.com:aofficer/umd_dev"

This reverts commit 8027dc9dfa7b2e4e4af5e698caecea2550a75d7f, reversing
changes made to 1d5702016c1495ab917925012de47390a6e570d9.
Merge branch 'master' into new

Conflicts:
	sites/default/settings.php
ohh no