lala
final version of code for hw1
Merge branch 'master' of https://github.com/mhmeisner/Stuff