added gitignore
Merge branch 'master' of github.com:Glis/PS-cgj2014
changed gitignore