before merge
Merge branch 'master' of https://github.com/Dtraft/corner-pocket

Merging.