Big Commit
Merge branch 'Peter'

Conflicts:
	NanaQuest/.metadata/.log
	NanaQuest/.metadata/.plugins/org.eclipse.cdt.core/.log

NanaQuest/.metadata/.plugins/org.eclipse.core.resources/.history/2b/8005
cb58a24c00131160c301a7cea5c5

NanaQuest/.metadata/.plugins/org.eclipse.core.resources/.history/34/a002
e6f2a24c00131160c301a7cea5c5

NanaQuest/.metadata/.plugins/org.eclipse.core.resources/.history/6c/5057
0589124b00131688c15185117d0d

NanaQuest/.metadata/.plugins/org.eclipse.core.resources/.history/d3/00ad
1a7da24c00131160c301a7cea5c5

NanaQuest/.metadata/.plugins/org.eclipse.core.resources/.history/f3/20be
9115a34c00131160c301a7cea5c5

NanaQuest/.metadata/.plugins/org.eclipse.core.resources/.projects/NanaQu
est-android/org.eclipse.jdt.core/state.dat

NanaQuest/.metadata/.plugins/org.eclipse.core.resources/.projects/NanaQu
est-desktop/org.eclipse.jdt.core/state.dat

NanaQuest/.metadata/.plugins/org.eclipse.core.resources/.projects/NanaQu
est/.indexes/e4/9d/8e/fc/87/history.index

NanaQuest/.metadata/.plugins/org.eclipse.core.resources/.projects/NanaQu
est/.markers

NanaQuest/.metadata/.plugins/org.eclipse.core.resources/.projects/NanaQu
est/org.eclipse.jdt.core/state.dat
	NanaQuest/.metadata/.plugins/org.eclipse.core.resources/.root/10.tree

NanaQuest/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.e
clipse.core.resources
	NanaQuest/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	NanaQuest/.metadata/.plugins/org.eclipse.jdt.core/186155986.index
	NanaQuest/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	NanaQuest/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt

NanaQuest/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory
.xml

NanaQuest/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_
settings.xml
	NanaQuest/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml

NanaQuest/NanaQuest/bin/net/obviam/nanaquest/controller/ShipController.c
lass
	NanaQuest/NanaQuest/bin/net/obviam/nanaquest/model/Ship.class
	NanaQuest/NanaQuest/bin/net/obviam/nanaquest/screens/GameScreen.class
	NanaQuest/NanaQuest/src/net/obviam/nanaquest/screens/GameScreen.java
	NanaQuest/NanaQuest/src/net/obviam/nanaquest/screens/PauseScreen.java

nanaquest/NanaQuest/NanaQuest/src/net/obviam/nanaquest/screens/PauseScre
en.java