first commit
Merge https://github.com/slisenberger/ee122-projects