edited readme name, added travis.yml
fixed spec/model merge conflict