Added profile.edit.jade, created profile edit route. Also added new fields in user model
Merge branch 'master' into hookMeUp

Conflicts:
	models/user.js