probably fixed resizing
Merge branch 'master' of github.com:Divinare/hyhci_team