..
Merge branch 'master' of https://github.com/vikviky/GM3

Conflicts:
	gay pride/gay pride.userprefs