Correct export behavior of dbschemas, reference dbconfig file for db credentials
Changes to .gitignore required to be committed in order to continue merge
Merge branch 'master' of https://github.com/michaelmunson1/caracol

Conflicts:
	.gitignore
add db config
Debug: true
Merge branch 'master' of https://github.com/michaelmunson1/caracol
Remove uuids
Merge branch 'master' of https://github.com/michaelmunson1/caracol
change object format; fix bug
inject angular into page with iframe; still bug with angular loading
change object format; fix bug
toy with index.jade/script.js
loads jquery/script.js async and inserts angular div
Merge branch 'ng' of https://github.com/michaelmunson1/caracol into ng

Conflicts:
	client/partials/home.html
	client/script.js
	database/dbclient.js
	server.js