Commits? No idea
Commits

Conflicts:
	Server/uWatchServer/bin/Data/Database.class
	Server/uWatchServer/bin/Server/ServerController.class
	Server/uWatchServer/src/Data/Database.java