no message
Merge branch 'master' of https://github.com/pun2345/Dumbobay

Conflicts:
	application/views/.DS_Store
	application/views/assets/.DS_Store
Merge branch 'master' of https://github.com/pun2345/Dumbobay
no message
Merge branch 'master' of https://github.com/pun2345/Dumbobay