begonnen met image uploadchange
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/users/profile.blade.php