finish
Merge branch 'master' of https://github.com/mikomize/compo-2013