Fixing .ignore conflist
Merge branch 'master' of https://github.com/nlubczynski/DesignProject.git
Fixed Contract to have right member variable type for id (String)
Mostly complete XML Reader