first commit
Merge branch 'master' of https://github.com/Franx0/Tyrell_Rails