Merge branch 'lassi'
create table.sql and modify index.php