Added a line here also
Merge branch 'master' of github.com:ervajn/gitex

Conflicts:
	README