Showing messages
Merge branch 'master' of https://github.com/MICOU159/MiniProjet

Conflicts:
	gen/ca/ulaval/ima/miniprojet/R.java
	res/layout/fragment_accept_request.xml