Merge branch 'master' of https://github.com/doxman/chamber-crawler

Conflicts:
Makefile
Fixed makefile