Bugfixed DataPreparer into "working" state.
Merge branch 'master' of https://github.com/wensby/ai-project

Conflicts:
	bin/Item.class
	src/DataPreparer.java
	src/Database.java
	src/Main.java