init ........
Merge branch 'master' of github.com:binli-swiftkey/sk_chefrepo

Conflicts:
	.chef/knife.rb
init.....
x
Merge branch 'master' of github.com:binli-swiftkey/sk_chefrepo