Sigh... Merging without a gui..
Merge branch 'master' of https://github.com/dande011/cs14-assign
Lots of changes during lab.
Merge branch 'master' of https://github.com/dande011/cs14-assign

Conflicts:
	assignments/assn1/MyList.cc
	assignments/assn1/main.cc
This is a changes.. broke?
Stuff was broken, and the new test file
Merge branch 'master' of https://github.com/dande011/cs14-assign
Fixes?
Merge branch 'master' of https://github.com/dande011/cs14-assign
Changes
Lab5 work