just commiting so I can pull
Merge branch 'master' of github.com:StevenGerdes/ECE421-project-4
Added exceptions