Local conflicts
Restored LICENSE and merged .gitignore
'rails new' stuff