commited for index.html conflict
Merge branch 'master' of https://github.com/Arknium/inpno