Added generated files for app.
Merge conflict in .gitignore resolved.