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
fixed misplaced fov
started test classes for developement of level
and for catching the dragon
Merge branch 'master' of github.com:mixotroph/swp-2013
Box.java: added first draft of a box class
added wasd-controls
Merge branch 'master' of github.com:mixotroph/swp-2013

Conflicts:
	src/rogue/Rogue.java
finishing up the level loader
rogue gemacht
updated from master
modified boxes
Added special level Layer.java and other stuff for story-telling purposes.
Merge pull request #1 from fabig/master

wasd-controls
Merge wasd controls
Merge branch 'master' of github.com:mixotroph/swp-2013
added texts