Ruben

Integrate GUI into Master