Editted file
Added merge conflict line
Merge branch 'master' of https://github.com/zapatosgatos/csci3308
Testing merge conflict