Did some minor changes in main and Database
Merge branch 'master' of https://github.com/wensby/ai-project

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

Conflicts:
	src/Main.java
	src/Parser.java
	src/toDB.java