Push updates
fix merge conflict
modifed: index.php
Merge pull request #1 from mightcode/bugFix

Bug fix