INHERITANCE FOR ASSIGNMENT DONE! RETURN OBJECT TO GUI ROUGHLY DONE!
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/.gitignore