Fixes
Merge branch 'master' of github.com:funddy/funddy.github.io
Merge
Fixes