second commit
Merge branch 'master' of github.com:OscarBastardo/launch-with-code
new django app joins