服务器
d
Merge branch 'master' of https://github.com/UltraHector/NightFuryServer

Conflicts:
	NightFuryServer/src/main/java/com/TroyEmpire/NightFuryServer/Usage/RestaurangSQLgenerator.java
	NightFuryServer/src/main/java/com/TroyEmpire/NightFuryServer/Usage/YellowPageSQLGenerator.java