haha
Merge branch 'kyleB'

Conflicts:
	conflict.txt
Test
Test
Merge branch 'kyleB'

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