I resolve conflict on 16
Merge branch 'master' of https://github.com/EpokK/epokk.github.io