ololo + parser
Merge branch 'khan' of github.com:cybern223/kinoserver