Deleted ss/classpath ss/project and ss/settigns from git
Removed ss/.classpath, ss/.project and ss/.settings from repo
Merge conflicts
Merge conflicts
Merge branch 'kevin'
Merge branch 'sophie'
Merge branch 'master' of https://github.com/Kurocon/softwaresystemen into kevin