removing render-blocking css aka custom fonts
removing my jquery file fallback, testing text/javascript in htaccess
Trying out google customer fonts inline
Add custom fonts back in, update compression in htaccess
oops, minify css compression was undone
Update custom type to just use typekit
thin proxima was too light
Okay, can't take it. Need Gotham in there.
new gulpfile with js minify, alongside package.json, also gulp doing its thing
new favicon
new brand color
Merge branch 'master' of bshackelford.beanstalkapp.com:/bshackelford/bshackelford

Conflicts:
	css/style.css