Tweaked values for gaming experience
conflict fix
Added gitignore