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 branch 'master' of https://github.com/sinagaboni/TKPPL
Merge remote-tracking branch 'origin/master'

Conflicts:
	DAILY SCRUM.txt
	src/index.jade