Development

Merging the master branch to the dev branch. New baseline with shooting and player/enemy health. Most of the fundamentals are now in place.