I think I have successfully implemented all of the changes I made during
today's meeting back into the original master branch as opposed to the
sidebranch I created today before I headed to class!

Let me know if you notice that I missed anything!

Also, I have not looked into how to now get rid of the sidebranch, but
if someone could figure that out and get rid of it that would be great!