Merge branch 'Dunn_Works'
Merge branch 'master' into Dunn_Works
about to merge master with mine to hopefully realize everything isnt fucked up