Removing workspace.xml
Updated gitignore
Updated gitignore
Merge branch 'master' of https://github.com/flamusdiu/Project11_3