Github and git conflict

Github and git

CSC4110-assignment1

Thaddious Gorges

fx7385