Merge pull request #1 from bhush9/master

Add CMakeLists.txt
	modified:   src/ishara.cpp
	modified:   src/aboutdialog.cpp
Merge pull request #2 from saikatbsk/master

merge changes