Merge pull request #6 from dotted/master

Create initial work for turn class
Started working on GameView
Corrected Typo, cleaned Main funtion
Added GameView
stuff

stuff
Merge pull request #7 from Voxvalve/master

stuff
Added NetBean files
Added NetBean files
Merge branch 'master' of https://github.com/Nicolai-/Matador-BFJ_RJC_NST

Conflicts:
	Matador/nbproject/private/private.properties
	Matador/nbproject/private/private.xml
Update git ignore
Merge remote-tracking branch 'upstream/master'