backend stuffs
Please enter the commit message for your changes. Lines starting
Fix conflict image
Merge branch 'master' of f:/repositories/dcs-website
modified address appearance in footer
fixed overflowing content in footer
returned background image in homepage
Merge branch 'master' of f:/repositories/dcs-website
first step on update prof
Merge branch 'master' of /../media/ROOT/repositories/dcs-website

Conflicts:
	application/views/users/profile.php
give to up button in footer
Merge branch 'master' of f:/repositories/dcs-website
added up logo in homepage menu
made homepage sidebar sections non-fluid
Flag Set
Merge branch 'master' of /../media/ROOT/repositories/dcs-website
added links to some social network accounts
Merge branch 'master' of f:/repositories/dcs-website
namespaced stylesheet for profile update form fields
edit front-end profile and update profile