Merge pull request #1 from jasonZYJ/current-jason

add fixtures
Add cpanel file
Merge branch 'master' into current-jason

Conflicts:
	Gemfile