modified:   src/ishara.cpp
	modified:   src/ishara.h
	modified:   src/ishara.ui
Merge branch 'master' of github.com:saikatbsk/Ishara