pull updates #1
Merge branch 'master' of https://github.com/bayuhafiz/invntry

Conflicts:
	application/views/home.php