init symfony2
add PhpStorm to .gitignore
resolve conflicts