enemies now bouncing around, colliding with walls
enemy overlapping, death, game restarts
enemies are now reset when player dies
Dropped some more thugs around in the dungeon.
Added a bigger thug to the last room as a "boss."
Added an NPC && hardcoded and winning scenario
Merge branch 'feature/more-hardcoded-thugs' of https://github.com/arcym/adventure
pulled from Andrew. Big Thug is in action
slight variable change (prepping for pull request)
Merge pull request #14 from fpruitt/master

Adding clipping for offscreen elements, fixes #10
Merge branch 'master' of http://github.com/jshiraef/adventure

Conflicts:
	Adventure/src/computc/Dungeon.java
	Adventure/src/computc/Game.java
	Adventure/src/computc/Tile.java
Refactored a lot of different non-entity things.
Attempted to implement everything into gamestates.
Refactored the update and render for the old man.
Moved everything into different subdirectories.
Moved more into different subdirectories.
Fixed something I broke in the tilemap.
Merge pull request #20 from arcym/refactor/code-for-sprint-1

Made some overhauling refactorings I wanted formalize.
Merge pull request #5 from computc/master

Pulling from upstream..