Further developement of the Feature class
Merge branch 'master' of https://github.com/wensby/ai-project
renewed Item.java
User constructor is hopefully working.
Merge branch 'master' of https://github.com/wensby/ai-project
created class DataPreparer, and edited some of the unfinished constructors variables in Item and User in order to get autocorrect
nothing
Merge branch 'master' of https://github.com/steelstyle/ai-project into steelstyle-master

Conflicts:
	src/User.java
Merge branch 'master' of https://github.com/wensby/ai-project

Conflicts:
	bin/Item.class
	src/User.java
Feature class is finished
Started to link to train dataset
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Database.java
	src/Solver.java
Added IntegerPair