fix window border padding
Merge branch 'master' of bitbucket.org:jcurbo/capitol_cs714
two computers