added margin
Merge branch 'master' of https://github.com/seegan/Myproj
added
Merge branch 'master' of https://github.com/seegan/Myproj

Conflicts:
	application/controllers/welcome.php
	application/helpers/common_helper.php