Fully implemented basic parser, created basic game-loop
Attempting to merge master and develop