checkpoint
cleanup
Merge branch 'dev-refactor' of github.com:JoeJiko/www.joejiko.com into dev-refactor