first log
Merge branch 'master' of github.com:visayafan/visayafan.github.com

fix log conflict