Remove empty files
Merge branch 'master' of github.com:gousiosg/pullreqs
Stashed changes to spammer
Merge branch 'master' of github.com:gousiosg/pullreqs
Resolve conflict