changed local_config.json (maybe doesn't belong to git though)
Merge branch 'master' of github.com:fluxtream/fluxtream-capture
added file types to gitignore