merged alex's changes and added sqlite3 to gitignore