Hey, mine is better
Merge branch 'master' of github.com:zhariffadzli/learngit

Conflicts:
	index.html