preparing to move function tests into correct
Merge branch 'master' of github.com:Toad2186/cs164