Resolving conflict
Merge branch 'master' of github.com:CassyJens/EcoDataWarehouse-Node