Max was trying to make changes but Ed was working too!
Merge branch 'master' of https://github.com/jessicalundin/PIRE_test

Conflicts:
	Test.rtf

Trying to commit the merge, by Max