finished writing functions for lab 7
Merge remote branch 'origin/master'