Merge branch 'frontend' of github.com:utwente-di/di18 into database
Changed getfossdesc to getfoss
Merge branch 'database' of github.com:utwente-di/di18 into frontend
koffiesletje heeft dorst maar niemand haalt koffie voor hem :(
Merge branch 'frontend' of github.com:utwente-di/di18 into frontend