gitignore fix
marks
Merge branch 'master' of https://github.com/itstepP1102014/ControlPoint