testing
pull push test
Merge branch 'master' of https://github.com/ronaldtx/badiklatci

Conflicts:
	.gitignore