Merge branch 'bourbon-edits'
Merge branch 'bourbon-edits'
Removed favicon
Merge branch 'master' of https://github.com/natedunn/Flint