changeviews
Merge branch 'master' of https://github.com/poppinyunhai/btc

Conflicts:
	Gemfile
change views