First commit.
Adding stuff to master after first commit
Adding stuff into FF_BRANCH
Adding stuff into NFF_BRANCH
Merge branch 'NFF_BRANCH'
Adding more stuff into NFF_BRANCH
Adding more more stuff into NFF_BRANCH
Merge branch 'NFF_BRANCH'
Adding more more stuff into FF_BRANCH
Adding more more more stuff into FF_BRANCH
Merge branch 'FF_BRANCH'

Conflicts:
	file.txt
Adding stuff on master
More stuff on master
Stuff in FF_BRANCH
More new stuff on FF_BRANCH
Merge branch 'FF_BRANCH'

Conflicts:
	file.txt
New stuff branch ff
Testing FFBRANCH
Merge branch 'master' of github.com-personal:BRabbit27/GITest