Commit 2

2nd Commit - Didn't have time to do the programming exercises. Will do
later at home