Merge pull request #6 from 2015HackNTU/kabochya

Kabochya
Merge branch 'master' of github.com:2015HackNTU/2015HackNTU.github.io into kabochya