Pulled changes accidentally sent to master

This is indentical to the 'Portal Groundwork' commit from the master
branch except for the tiny change you see here.

If this runs on your computer, let me know. For whatever reason, it
can't find swatch.png even though everything is completely totally right
as far as I can tell
Beginnings of the portals

Can make a swatch. Mostly scanned code for understanding re-factoring
the smelly parts
Trivial
Merged in Combat
Merge cleanup

Still figuring out this tortoise merge gui. Had to manually fix up some
stuff
Tiny bit more merge cleanup

It runs now!
Merge branch 'Portal'

Conflicts:
	DevMaze/src/com/devtalk/maze/DevMaze.java
	DevMaze/src/com/devtalk/maze/GameScreen.java
	DevMaze/src/com/devtalk/maze/MainMenuScreen.java
	DevMaze/src/com/devtalk/maze/Maze.java
	DevMaze/src/com/devtalk/maze/Tile.java
cleaned up merge