Added DB sql file
Added DB sql file
Merged db into master
Resolved sql conflict