sfasdfasdfsafsd stupid visual studio moving files around
Merge branch 'jk2hd' of https://github.com/eezstreet/OpenJK into jk2hd