little chang0

Signed-off-by: Adeel <adeeltariqagain@gmail.com>
Merge branch 'AdeelTariq-alpha' into HEAD

Conflicts:
	statusWindow.py

Signed-off-by: Adeel <adeeltariqagain@gmail.com>
Merge branch 'Adeeltariq-alpha' into master3

Conflicts:
	statusWindow.py
chnage
merge

Signed-off-by: Adeel <adeeltariqagain@gmail.com>
Merge pull request #90 from SGover/Adeeltariq-alpha

Adeeltariq alpha