prepare to merge
tjosan

Merge branch 'master' of https://github.com/patwotrik/conprogass3