more week 2-3
Merge branch 'master' of github.com:joshkeller/joshkeller.github.io