aplot kerjaan tino, index.html dan kawan kawan
Merge branch 'master' of https://github.com/chidx/IF3038-2013

Conflicts:
	src/fungsi.js