j'ai tout niké
Merge branch 'master' of https://github.com/DParat/PW2A

Conflicts:
	app/controllers/Application.java
	app/views/index.scala.html