no fullscreen for firefox
resolve conflicts
Merge branch 'master' of github.com:FranzPoize/5colordeathrow