Update .gitignore
increasing default map window size
GUI now handles resizing of the window
fix to buttion locations in original window size
Removed desktop dependency on libx11
removing old comment
Merge branch 'master' into graphics
Merge branch 'master' into mac-port

Conflicts:
	src/main.cpp