Added Objects and Classes
Cleaned
Merge branch 'master' of https://github.com/DCSGInterns/GUI