using env variable for fielddb location
Merge branch 'master' of github.com:cesine/FieldDBWebServer
Revert extraneious formatting in sublime

This reverts commit f84715117f8704805a2df89770ffc44234f3f630.

Conflicts:
	public/dev.html
separated website from the webserver's corpus pages libs
updating dev blogs links to new folder structure

and updating bootstrap and twitter widgets
updating website to new folder structure
updating privacy page to new folder structure and puttin bootstrap styling to defaults
at some point scale is a number
updating corpus pages to new folder structure
added favicon
fixing broken link in slides
using the ubuntu bootstrap theme on the privacy page
Merge pull request #20 from cesine/master

Refactor to separate website from corpus pages