my change
Merge branch 'master' of https://github.com/abyasasvi/KT
change on same line
Merge branch 'master' of https://github.com/abyasasvi/KT

Conflicts:
	slider/index.html