8a035b741eebc0f
Merge branch 'master' of github.com:kaidez/kaidez.com (see msg)

just fixing stuff...merged b/c i was asked to.