Fixed copy
Merge branch 'bug-fix-1'
Deleted all copy
Added master branch indicator
Added bugfix2 indicator
Merge branch 'master' into bugFix2

Conflicts:
	index.html
Merge branch 'bugFix2'
Deleted Heads and other items from conflict
Merge branch 'bugFix2'

Conflicts:
	index.html
Last commit directly to master branch
MAde a change on branch 2 for merge test
Merge branch 'bugFix2'

Conflicts:
	index.html
CHanged some copy
Added a new note
Added anther line
Merge branch 'fix2'

Conflicts:
	index.html
After conflict merge
A newfix