git ignore update
sinatra and database
merged sinatra and master branches.
modified .gitignore