tweak to get heroku run
add unicorn gem
start on Search and Trade tests
merge conflict