added the new db
Merge branch 'master' into HaiBranch
switching over to master
got closer to connect the db to the form
editted the view
Merge branch 'master' into HaiBranch