gemfile fix
add badge to readme
added application.yml
added application.yml
Merge pull request #7 from ozayyad/pair-ozayyad,tjhernandez

added application.yml
added coveralls to readme
Merge branch 'master' of https://github.com/ozayyad/SNPy
fix merge conflicts
Merge pull request #6 from ozayyad/nataliemac81

add badge to readme
merge conflicts
trying to fix this merge confilct
testing confilicts
test
Merge pull request #8 from ozayyad/nataliemac81

test
working on a rake task"
update readme with coverage and build status badges
are able to upload all the markers
update specs
i don't know why I am doing this
maybe