Update gitigore
Merge branch 'develop' into stb_image