line endings
Merge branch 'master' of https://github.com/jiffypop45/CS450AssignmentTwo