gui initial state
Merge branch 'master' of https://github.com/esneider/ITBA_SS_13_Allocators