Edit css and my profile
add pictures and edit profile and css
edit profile
Merge branch 'siena'

Conflicts:
	profile_3.html