code is working, no merge errors, no routing errors
Merge pull request #25 from belindahare/master

code is working, no merge errors, no routing errors