first commit
Merge https://github.com/gabrielgallo/solid-rock