*facepalm*, minor fixes, but loops like a madman
Merge branch 'master' of https://github.com/travpurc/CSCE-438-HW3