XCode
Quiz view controller
Merge branch 'master' of github.com:sjjh/guidev2

Conflicts:
	clocks.pro