Merge
Merge branch 'master' of https://github.com/XciD/competences

Conflicts:
	public/app.js
	public/mycomp.html