some stuff
Merge branch 'master' of github.com:barcharcraz/d3dGame