nothing changed
user stories
Commented out database
Attempting to merge
Changed settings