Initial commit!
Merge branch 'master' of github.com:tnwae/nrw

Fixed conflict in .gitignore from GitHub and the one generated by Rails.