Merge branch 'master' of https://github.com/Deloux/repo

Conflicts:
index.php
wat