Dev

Merge for working, stable dev branch. Looking to start implementation of AI shortly for the Player entity