Close #2
Merge branch 'master' of github.com:oSoc14/website