Added another file
commit number 2
Another commit which is used for demo purposes *<8^D->--<]:
kdkdkdkdkdkdkdkkd
Merge branch 'master' of https://bitbucket.org/james-gray/gitdemo

Conflicts:
	text.txt