Nothing special
last changes
Merge branch 'master' of github.com:hieurl/webint

Conflicts:
	public/evaluation.html
	public/scripts/submit_form.js
Last changes
Merge branch 'master' of github.com:hieurl/webint

Conflicts:
	public/course.html
	public/main.html
	public/stylesheets/style.css