more for the website and additional todo stuff
Merge branch 'master' of https://github.com/Huii/cg1213rc