initial commit
wrote a few conditions, can't test anything
monday night... further but not working
Merge branch 'master' of github.com:eddieburns55/lab6