First merge
Modified Procfile
Test
Test
Done: database design, madiafiles and static files settings, store app