Hey dogs there's a conflict and such
Merge branch 'master' of https://github.com/cdyck/310lab2 into aidan2
Woohoo
Fixed!!!! i hope erge branch 'aidan2'

Conflicts:
	conflict.txt
Merge branch 'master' of https://github.com/cdyck/310lab2

Conflicts:
	conflict.txt