- Clean up the conflcits around public/index.html
- Add the basic artifacts done in the class (db migration, model and views)