Merge pull request #5 from agunghadhinata/master

Merge pull request #9 from dqkurniawan/master
Merge pull request #6 from agunghadhinata/master

Perbaiki Index Jade
index.html baru..
Delete image di public, dan edi index.jade
delete gambar
Merge pull request #11 from dqkurniawan/master

merge index.html dan delete gambar
Merge branch 'master' of https://github.com/agunghadhinata/TugasTKPPL
masukkan lagi gambar
Masukkan gambar
Tambah World Cup Timeline 1930, 1934, 1938, 1950 dan Gambar
Merge pull request #7 from agunghadhinata/master

Tambah World Cup Timeline 1930, 1934, 1938, 1950 dan Gambar
Merge branch 'master' of https://github.com/agunghadhinata/TugasTKPPL into agunghadhinata-master

Conflicts:
	FIFA World Cup 2014/public/index.html
Tambah World Cup Timeline 1970, 1974, 1978, 1982
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