Merge branch 'master' of github.com:Maikon/Soma into develop
Merge branch 'develop' of github.com:Maikon/Soma into develop
Merge branch 'develop' of github.com:Maikon/Soma into develop
Merge branch 'develop' of github.com:Maikon/Soma into develop
allows user to get resource for specific blood part thourgh blood-tests/results/:name
Merge branch 'develop' of github.com:Maikon/Soma into develop
fixed conflict
Merge branch 'feature/jsoning' into develop