Creating conflicts for Noah Williamson
Merge branch 'master' of https://github.com/cdyck/310lab2
Resolving conflicts for Noah Williamson
Conflicts:
	conflict.txt
Merge branch 'master' of https://github.com/cdyck/310lab2
Noah Williamson
Conflicts:
	conflict.txt