添加代码规范
代码规范
first post
Merge branch 'master' of github.com:alpar/alpar.github.com

Conflicts:
	.gitignore