first commit
setup
create show, index views and Router
create edit, postform
resolve conflicts