new file
new

new
Merge branch 'master' of https://github.com/kuandrew/RenrenPageHelper

Conflicts:
	Conf/config.php
	Conf/wx_config.php