Merge branch 'hotfix/Charset-fix-RAeS' into develop
test new index page with full new logo
test config changes
Update index.html
testinverted colours as per request
Merge branch 'develop' of github.com:StrathSEDS/strathseds.org into develop
minor fixes
update with white text
I is stupid
damn fixes
Revert "damn fixes"

This reverts commit 1452e3d6729ed818863222a416ec254d6924a03d.
resolve conflicts
remove speed test
revert stuff
invert colours
fix image link
change from jpg to png
forgot to undo something
Update stuff for freshers
Merge branch 'release/content-update'