Merge branch 'master' of ssh://github.com/JungleCatSoftware/JungleCatSoftware-Website into dev
Updating index page
Updating about page
I thought I removed this word before that commit
Merge branch 'dev'