11
Merge branch 'master' of https://github.com/qadirbf/strong

Conflicts:
	.idea/.rakeTasks
	.idea/strong.iml
	.idea/workspace.xml
网站首页修改