update with drupal logo
Merge branch 'master' of https://github.com/mitchellhillman/jgadmin

Conflicts:
	.DS_Store
	sass/_base.scss
	sass/screen.scss
	stylesheets/screen.css