begin linting w/ grunt
lint script.js
major lint party
move dbconfig and dbsetup to config
fix path to config file in dbschemas
Merge pull request #58 from michaelmunson1/lint

Linted client/ public/ database/ controllers/ config/
passing four tests
bookmarklet added to the nav bar, with cool popover. also added sign in button and username buttons which can be toggled via ng-show as appropriate. username button has cool dropdown menu with sign out option.
Merge pull request #60 from michaelmunson1/addingToNav

added bookmarklet, and sign in / username buttons to nav
fixed bookmarklet button text height
style bookmarklet
Merge pull request #61 from michaelmunson1/addingToNav

fixed bookmarklet button text height
Merge pull request #62 from michaelmunson1/styleBookmarklet

style bookmarklet
started refactoring to modularized layout
made landing page
including landing page as index.js
throwin a jquery error on load and persisting across pages
Merge branch 'landing' of https://github.com/michaelmunson1/caracol into landing

Conflicts:
	public/views/index.html
	views/index.jade
fixed images and jade template