DB WORKS!
Test in Main.java
Merge origin/master