added almost works edit
Merge branch 'master' of https://github.com/Lauricio/feedme

Conflicts:
	client/users/user-profile.html