remove pesky mergetool orig files
equipment search results
add picture of dog pushing lawn mower
solve merge conflict
Merge pull request #18 from vivekmshah/james

James
homepage changes
merge master branch
home page icon row