First commit after generate first_app
Merging master and Origin/Master