submitting hw
Merge remote-tracking branch 'upstream/master'
removing .DS_Store items and updating the gitignore file
removed additional DS_Store files
Merge pull request #33 from rjdabbar/master

submitting hw