minor

Fixed two minor merge issues
Last fucking minor commit

Deleted .db after adding it to .gitignore. fml