deleteme
Merge branch 'master' of https://github.com/bojko108/mtb

Conflicts:
	js/Profil.js