Add merimakkara, edit index
Merge branch 'merimakkara'