Merge pull request #1 from computc/master

Pulling upstream Start World Code into my branch
Merge pull request #2 from computc/master

Merging
Merge pull request #3 from computc/master

Mergin' upstream
Clipping for all not in current tiledroom
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."
Merge pull request #18 from arcym/master

Added some documentation to some of my classes.
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
Fixed.
Merge branch 'computc-master'
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