Window height fix
Merge branch 'master' of github.com:dylanPowers/hackathon2013