rm Makefile Makefile.in main/.deps/ main/Makefile main/Makefile.am
Merge branch 'master' of github.com:wenjiegit/Bull-Live-Server