Versi 5
Merge branch 'master' of https://github.com/aredoes/Codi.git

Conflicts:
	application/views/index.php
	application/views/viewNilai.php