Merge remote-tracking branch 'origin/master' into adheyulindasuherman-master
Merge branch 'master' of https://github.com/adheyulindasuherman/TKPPL into adheyulindasuherman-master

Conflicts:
	DAILY SCRUM.txt
	src/index.jade
Merge pull request #18 from adheyulindasuherman/master

adhe compere terbaru
Merge branch 'master' of https://github.com/sinagaboni/TKPPL
Merge remote-tracking branch 'origin/master'

Conflicts:
	DAILY SCRUM.txt
	src/index.jade
Merge pull request #19 from adheyulindasuherman/master

tambah slide ubuntu
Create README.md
Merge branch 'master' of https://github.com/alfahmi55/TKPPL

* 'master' of https://github.com/alfahmi55/TKPPL:
Merge branch 'master' of https://github.com/sinagaboni/TKPPL into sinagaboni-master
edit daili scrum
Merge pull request #20 from alfahmi55/master

Merge branch 'master' of https://github.com/alfahmi55/TKPPL
Boni Tambah kelebihan dan kekurangan linux debian dan insert gambar
Merge pull request #7 from sinagaboni/master

Boni Tambah kekurangan dan kelebihan linux debian dan insert logo debian
redhat lanjutan irvan
Merge pull request #21 from alfahmi55/master

irvan tambah redhat lanjutam
Merge pull request #7 from sinagaboni/master

Boni merge Irvan tambah kelebihan dan kekurangan red hat ke adhe