Merge pull request #5 from amandawraymond/apply_oop

Full refactor suggestions fixed
Merge pull request #6 from amandawraymond/apply_oop

add gerry's suggestions and rspec files.want to merge with master