This is the first commit
Second commit
Commit to secondary branch
First commit with random text
My first changes by adding a line to the textfile called lotsOfText
First change to new branch
One line added to txt file. Switching branches
To allow change in branch for pre-merge
Again
Ready for merge
Ready, corrected
Resolve merge errors

Conflicts:
	lotsOfText.txt
Merge branch 'master' of https://github.com/atpaul/SCTest13
Change1
Change 2
Merge branch 'myNewBranch'
dunno what this will do
Commit new changes
Committing
crap