Merge branch 'testing'
omg _site!!!! and animate
Merge branch 'master' of github.com:fhurtubise/fhurtubise.github.io