a few updates to stage 2
Don't know why I'm committing.
Still don't know why I'm committing.
Points are iffy.
Kate's commit.
nothing I try is working..
Having trouble with point 2.
fixed the merge
Merge branch 'master' of https://github.com/k8wells/452-2
Another commit.
trying with kate
fixed merge conflicts
only because it's making me commit
may have helped a little bit.?