Commit pour pull =)
Merge branch 'master' of https://github.com/LucieBa/twitter

Conflicts:
	main.js
	views/index.html.twig