changed database username and password
added database sql file
Merge branch 'master' into jason