test pull readme
Merge branch 'master' of github.com:bicolIT/bicolit.org

Conflicts:
	readme.md
fix conflic