getting git up to date with local
fixed resizing stuff