bug fix redesign
Merge branch 'gh-pages' of http://github.com/pouriaMaleki/jik into gh-pages
redesign