Merge pull request #5 from agunghadhinata/master

Merge #4
edit jade nya, bukan html nya
Merge branch 'master' of https://github.com/agunghadhinata/TugasTKPPL into agunhadhinata-master
Merge branch 'master' of https://github.com/agunghadhinata/TugasTKPPL

Conflicts:
	FIFA World Cup 2014/src/index.jade
ini mw di hapus
hapus hello.txt
Perbaiki file index.jade
commit ssuatu gambar
Merge branch 'master' of https://github.com/agunghadhinata/TugasTKPPL into agunghadhinata-master

Conflicts:
	FIFA World Cup 2014/public/index.html
Tambah FIFA World Cup Timeline 1954,1956,1960,1964
Merge pull request #12 from dqkurniawan/master

Tambah World Cup Timeline 1970, 1974, 1978, 1982
hapus hello.txt
Perbaiki file index.jade
commit ssuatu gambar
Merge branch 'AfiveD-agunghadhinata-master'
perubahan index html merge
Ini Index.jade  yang sesungguhnya
Perbaikan merge file yang conflict
Merge pull request #8 from agunghadhinata/master

Merge ke dicky