now changing defaults to 2d
Merge branch 'master' of https://github.com/BrandonRude/Project-Alpha