Fixing

Fixing Stuff. OOP
Merge remote-tracking branch 'origin/master'

Conflicts:
	TECSheet.v12.suo