Updated datamodel to be simpler!
Merge branch 'master' of github.com:BergarSimonsen/BNDN-Project