initial commit
Merge https://github.com/jtrope89/adv-prog-lab2