remove the redundatn folder
fix the html for the database
Merge branch 'master' of https://github.com/arikalfus/OperationNightlife

Conflicts:
	.idea/workspace.xml
	index.html
Merge branch 'serverTesting'

Conflicts:
	.idea/workspace.xml
Merge branch 'serverTesting'

Conflicts:
	.idea/modules.xml
	.idea/workspace.xml
Reverting to commit 86ac581abbb0c7d0188bf48f7e15278ad7e06ee1
Debugging server
Testing server
Server testing
Server testing
Server testing
Testing server
Final server testing
Testing server still
Server testing
Server testing
Server testing
server test
sever test
server testing