add gitignore
add database functionality
merged files