attempt at setup
added Boxfile config
Boxfile edit, added mysql
edit Boxfile
added phpmyadmin
phpmyadmin user
edit conDB
edited Boxfile
changed back API settings for google/facebok
getting this to work dammit!!
Pagodabox inital setup stuff

I added the boxfile for pagoda (config file), as well as PHPmyadmin for the site.

Conflicts:
	lib/credentials.php
Merge branch 'master' of git.pagodabox.com:circulate

Conflicts:
	lib/credentials.php
Merge branch 'master' of https://github.com/elizuck/circulate

Merged this branch with the Pagodabox settings for the new live environment.

You should a Boxfile added, as well as a myphpadmin folder