confli
Merge branch 'master' of https://github.com/sendyHalim/b

Conflicts:
	.gitignore