Added twitter parsing and saving
Fixed merge issues