gitignore and gemfile update
Merge branch 'feature/static-content-controller' of github.com:friggit/friggit into feature/static-content-controller
tests not completed add test views