gitignore added
merge conflict
Unit test support
added file QActions with menu, toolbar and a resource file.