Test Add Something
DataBase
Merge branch 'master' of https://github.com/Da-Huang/Cloud-Disk-Search

Conflicts:
	Cloud-Disk-Search/.classpath
	Cloud-Disk-Search/src/database/DBConnection.java
Conflicts Merge