ignore
Merge branch 'master' of https://github.com/ruirayli/agileer

Conflicts:
	blog/wp-config.php
Merge branch 'master' of https://github.com/ruirayli/agileer
Merge branch 'master' of https://github.com/ruirayli/agileer
Merge branch 'master' of https://github.com/ruirayli/agileer
Merge branch 'master' of https://github.com/ruirayli/agileer
Merge branch 'master' of https://github.com/ruirayli/agileer
Merge branch 'master' of https://github.com/ruirayli/agileer
Merge branch 'master' of https://github.com/ruirayli/agileer
Merge branch 'master' of https://github.com/ruirayli/agileer
Merge branch 'master' of https://github.com/ruirayli/agileer
Merge branch 'master' of https://github.com/ruirayli/agileer
Merge branch 'master' of https://github.com/ruirayli/agileer