try 4
Merge branch 'master' of https://github.com/marcDouglas/WindowControlGUI

i have no idea what i'm doing