testing
commit all
deleting files
Merge branch 'master' of https://github.com/gabrielgallo/solid-rock
commit all