Some changes

- added new type of flux
- merged data into one file
- made countries clickable to display flux