Totally forgot to reupload my files

I forgot to check Github after changing several things, so I took what
you added and merged it with what I had.