first commit
added functions
added function mark
added poop
merged marks branch
Merge branch 'mark'
added a line
added print statement
merge conflict probably
Merge branch 'mark'
added a parameter
merging
Merge branch 'master' of https://github.com/Vaishaal/testRepo