added conventions
Merge branch 'master' of https://github.com/Toixinhell/Versteckies