index page design
conflict resolved
some changes
Merge branch 'master' of https://github.com/emocentmagar/jukson into mitab
Merge pull request #11 from emocentmagar/mitab

Mitab