For merge
Merge branch 'master' of https://github.com/Harkell/project
Merge branch 'master' of https://github.com/Harkell/project
Updated layouts (JHS)