Edit gitignore
Merge branch 'master' of https://github.com/venabulum/first_app