setup
setup
strange commit
strange
strangggggggggggggge
again
search
all
last try
last last try
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/.classpath
	Project/src/configuration/DBConfig.java
	Project/src/main/Main.java
	Project/src/menu/Window.java