wtf
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  add guestPic

Conflicts:
	_site/atom.xml
	_site/sitemap.xml
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  update title
123
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  update tabbarView

Conflicts:
	_site/atom.xml
	_site/sitemap.xml
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  123

Conflicts:
	_site/atom.xml
	_site/sitemap.xml
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  update description

Conflicts:
	_site/atom.xml
	_site/sitemap.xml
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  post shader popup

Conflicts:
	_site/atom.xml
	_site/sitemap.xml
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  post Scale9Sprite_and_tile
  refresh

Conflicts:
	_site/atom.xml
	_site/sitemap.xml
123
Merge commit 'c396ce46223faf8dbbbe4ce7aa771a88357e9a54'

* commit 'c396ce46223faf8dbbbe4ce7aa771a88357e9a54':
  add 【cocos2d-x】

Conflicts:
	_site/atom.xml
	_site/sitemap.xml
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  2

Conflicts:
	_site/atom.xml
	_site/sitemap.xml
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  post UserDefault保存数组(ValueVector)
  fix

Conflicts:
	_site/atom.xml
	_site/sitemap.xml
no message
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  add jiaThis

Conflicts:
	_site/atom.xml
	_site/sitemap.xml
header
update about
12
Merge branch 'gitcafe-pages'

* gitcafe-pages:
  update about
  header

Conflicts:
	_site/atom.xml
	_site/sitemap.xml
about