Sync non-app files from master with week_1 branch