changed mac version to 1 window
resolved merge conflict
changed cmd-f to cmd-5 and version
Merge branch 'master' of github.com:jeena/Bungloo