TermPanel.java: implemented function 'bufferFile(String path)'
Terminal.java: implemented function 'bufferFile(String path, int row)
Rouge.java: changed terminals object type from TiledTermPanel to
TermPanel', added startscreen and simple endscreen
first merg try
fixed merge
Added ScreenThread.java
Class invokes a new thread and displays a static or animated screen; known issues: concurrency problem occurs when
the thread is interrupted.
experiments with graphics
concurrency experiments
Merge branch 'TiledTerm' into experimental

Conflicts:
	src/jade/ui/TermPanel.java
	src/rogue/Rogue.java
	src/rogue/creature/Player.java
graphical functions enabled and improved
also added class bufferFov in TitledTermPanel.java
the players fov is now uesed to draw the map
mend
mend
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
Merge branch 'master' of github.com:mixotroph/swp-2013

Conflicts:
	src/rogue/Rogue.java
finishing up the level loader