Improved the Profile styling 1 #214
improved the profile GUI (fade in and out to edite) , more styling to follow the sketches and temp data and pics untill replaced
deleted an uneeded imports
Resolved the conflicts
Update profile.html

Replaced my info div with happy's
resolved teh conflicts in profile.html
Merge pull request #222 from DinaSaad/C1_Beshoy_ProfileGUI

C1 beshoy profile gui
resolving conflicts #166
resolved the displaying image error #166
Removed the admin part as it was not approved or verified on the master so i don not know how it is merged here #166