adding parallax and integrating level generation
merging jons stuff into branch
fixing charge bug