Add paper clip, adds zipcode and gender to devise
adds name, zipcode and avatar to user
fix merge conflict