Prepare gitignore file and fabridc setup
Add nginx handler
Cleanup merge conflicts