first merg try
fixed merge
trying to commit before a pull
Merge branch 'master' of github.com:mixotroph/swp-2013

Conflicts:
	src/jade/ui/TermPanel.java
	src/rogue/Rogue.java
moved the screens to appropriate directories to mach paths given
in main()
screens moved to proper directories
fixed the problem with the start screen
in my local repo
started test classes for developement of level
and for catching the dragon
Merge branch 'master' of github.com:mixotroph/swp-2013
Merge branch 'master' of github.com:mixotroph/swp-2013

Conflicts:
	src/rogue/Rogue.java
finishing up the level loader
rogue gemacht
updated from master
Merge branch 'master' of github.com:mixotroph/swp-2013

Conflicts:
	src/jade/gen/map/Maze.java
	src/jade/ui/TiledTermPanel.java
Merge branch 'master' of github.com:mixotroph/swp-2013
prepairing to merge branch1 into main
 again
getting loader
the levelgenerator works but has problems with the camera
finished mapgenerator and started working on levelloaders
the MapLoader is finished and working:
Problems: Needs to load individual maps And needs to work with camera functions (ie. out of bounds exceptions).