charlotte
Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	web/harpaga/user/css/style.css