Delete Gemfile~
Fixed somethings in gemfile
Fixed old views
Merge pull request #1 from sahle123/sal_branch

Sal branch