Script edited
Merge branch 'master' of https://github.com/stefanlauren/IF3038-2013_2

Conflicts:
	Tubes_Progin_2/script.js
Merge branch 'master' of https://github.com/stefanlauren/IF3038-2013_2

Conflicts:
	Tubes_Progin_2/script.js
Rincian Tugas
Merge branch 'master' of https://github.com/stefanlauren/IF3038-2013_2
Rincian tugas updated
Merge branch 'master' of https://github.com/stefanlauren/IF3038-2013_2