Finished p2. Feel free to test and make sure I got everything
Merge branch 'master' of github.com:alexnedelcu/cs260_pa3