master

changed .gitignore and removed cache/twig_cache from versioning