have made project a bit pretty
correct gitignore settings
Merge remote-tracking branch 'origin/master'