formatted
Merge https://github.com/TheSighing/JDBCproject
almostdone