already have modem bug fixed
Merge branch 'change-internet-bug-fixing'
Merge branch 'master' of https://github.com/16twenty/contact

Conflicts:
	application/controllers/member.php