Added line at end of README file for the 'firstbranch' branch.
Added line to README file for second branch example
Merge branch 'firstbranch'
Merge branch 'secondbranch'

Conflicts:
	README
Fixed merge issues caused by two branches merging into master