create controller welcome
Update Gemfile.lock for Heroku
Merge pull request #2 from niklos2506/dev

Dev