o
Merge branch 'master' of github.com:ProjetPWEB/Projet

Conflicts:
	myapp/tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	myapp/tmp/cache/assets/development/sprockets/2f3ff7c1d5e6de0e84cbc58c35b7aaf3
	myapp/tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	myapp/tmp/cache/assets/development/sprockets/439eecc71fb4a82ebba35c99b7a9fa1b
	myapp/tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	myapp/tmp/cache/assets/development/sprockets/f89f558b38de1e8763ecc59bd55993bb