color more
Merge branch 'master' of github.com:ylwu/findTheFanta
commit
Merge branch 'master' of github.com:ylwu/findTheFanta
dhsffks
Merge branch 'master' of github.com:ylwu/findTheFanta
change logo
Merge branch 'master' of github.com:ylwu/findTheFanta

Conflicts:
	Storyboard.storyboard
Merge branch 'master' of github.com:ylwu/findTheFanta
gunman hidden
Merge branch 'master' of github.com:ylwu/findTheFanta
Merge branch 'master' of github.com:ylwu/findTheFanta
160
Merge branch 'master' of github.com:ylwu/findTheFanta
add documentation