Updated files (not README).
Merge branch 'master' of https://github.com/JoshuaHayden/Lab4_Hayden