Revert "12 11 2014"

Reverts barovig/OOP_GUI#2