commit just to check merge
Resolve merge
remove unused imports in database class
Merge remote-tracking branch 'origin/master'

Conflicts:
	Pain Recognition Brain Side/src/dataLayer/DataBase.java