first code commit
Merge branch 'master' of https://github.com/SeanGavan/382-Lab-1