update rails to 3.2.13 ruby to 2.0
Merge branch 'master' of github.com:KimiGao/sinuo

Conflicts:
	.gitignore