Modifying layout to use twig
Adding config for twig
Adding .idea to git ignore
Merging from remote