changing site name
:Merge branch 'master' of https://github.com/dsapandora/dsacamsite into story/CAMX1_change_site_apparnce
Merge branch 'story/CAMX1_change_site_apparnce' of https://github.com/dsapandora/dsacamsite into story/CAMX1_change_site_apparnce
fixing conflict