using prepared statement and some other changes
gitignore
merged