set up for localhost
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!!
editing search more
trying to merge
test
trying to change branches
pulling master
Merge branch 'addedDB'
popped userinfo.php messed up when go from userFeed.php
added notifications feature--need to update db schema using db/notifications.sql
Pagodabox inital setup stuff

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

Conflicts:
	lib/credentials.php