Merge branch 'master' of github.com:inferrna/WebQuake
Merge branch 'master' of https://github.com/inferrna/WebQuake into Going_malloc

merge
+fixes
+fix move