fixed conflicts
Merge branch 'master' of github.com:sgtsnookums/uc
finished hw 3
geo hw4