Merge branch 'master' of https://github.com/kittypryde/nanaquest

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

NanaQuest/.metadata/.plugins/org.eclipse.core.resources/.projects/NanaQu
est/.markers
	NanaQuest/.metadata/.plugins/org.eclipse.core.resources/.root/22.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/savedIndexNames.txt

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