aaa
Merge branch 'master' of https://github.com/girlygirl/alexking
aaa
Conflicts:
	build/classes/beans/Album.class
	build/classes/beans/Utilisateur.class
	build/classes/dBManagement/CRUD.class