made a mess
Merge branch 'master' of https://github.com/phansch/Projects
Fixed gitignore