local modifications to development branch. preparing new look for removal of twitter bootstrap
adding development settings
Merge pull request #1 from michelle-becker/devel

Devel