gitignore fix
Merge branch 'master' of ssh://catandmouse-mept.rhcloud.com/~/git/catandmouse