no message
no message
Merge branch 'master' of https://github.com/quxiz/ebid

Conflicts:
	src/main/java/com/se/ebid/controller/GiveFeedbackController.java