different gui?
add a line 1
and line 2
Merge branch 'test_branch_one' into development
added doc string near top
Merge branch 'adding_docstring' into development
moved docstring to very top
Merge branch 'modify_doc_string' into development
rebase test 1
no rebase just merge no-ff
Revert "no rebase just merge no-ff"

This reverts commit 5ac5cb60c359c28a1e38e33cd81571cab46bc02b.
no Rebase
Merge branch 'testing_rebase' into development
Ok ive just modified line 36
I didnt know someone had modified line 36
Merge branch 'two_players' into development
correcting conflict