Mikaela made a placeholder, goooooeed
merged conflicts with app.js