Initial github page.
updated db.
fixed conflicts.