1
Merge branch 'master' of https://github.com/andrew09091979/FirstType

Conflicts:
	FirstType.pro.user