project startup with rspec and haml
fix conflict in .gitignore