Create hotfix2.py
added merge of hotfix2 and feature2