refactoring
Merge branch 'master' of https://github.com/wensby/ai-project.git

Conflicts:
	src/Database.java
	src/Main.java