profile edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/profile.php
profile edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/profile.php
	public/css/style.css
profile edit