Small adjustment and changing my local repo

Moving my stuff around. I hope this doesn't screw anything up.
Merge branch 'master' of https://github.com/brashrebel/client-dash

Conflicts:
	admin/pages/page-settings.php
	readme.txt