'nothing'
'nothing'
Merge branch 'master' of https://github.com/Bougounisou/vm4u

Conflicts:
	app/static/css/layout.css
	app/static/js/basic.js
	app/templates/index.html