Merge branch 'master' of github.com:jlubawy/atrivialhero.com.
Merge branch 'master' of github.com:jlubawy/atrivialhero.com