my changes
second changes
split to different functions
Merge pull request #3 from beckhamer/hw3

my changes