first commit
First merge. Merge branch 'master' of https://github.com/charlesincharge/ee114_design