fixing loggin
fixing loggin
fixing loggin
fixing loggin
fixing loggin
fixing loggin
:Wq
Merge branch 'master' of https://github.com/dsapandora/camsite
Merge branch 'master' of https://github.com/dsapandora/camsite
Merge branch 'master' of https://github.com/dsapandora/camsite
Merge branch 'master' of https://github.com/dsapandora/camsite
Merge branch 'master' of https://github.com/dsapandora/camsite
Merge branch 'master' of https://github.com/dsapandora/camsite
Merge branch 'master' of https://github.com/dsapandora/camsite
Merge branch 'master' of https://github.com/dsapandora/camsite
Merge branch 'master' of https://github.com/dsapandora/camsite
Merge branch 'master' of https://github.com/dsapandora/camsite

Conflicts:
	.DS_Store
modify  name site