Merge branch 'develop'
fix generic styles
Merge branch 'develop'
Merge branch 'master' of github.com:fvillegas/franciscovillegas.net