Merge pull request #1 from awseward/development

Looks ready to merge
Merge branch 'development'
stop using old favicon
Merge branch 'master' of github.com:awseward/capfromscratch into development