stuff before merge
Merge branch 'master' of https://github.com/deriachai/441-Project1
mergings