still need revising
week4 in class
Merge pull request #42 from esthermun/master

in class week 4