Resolved mergeconflicts
Resolved some more mergeconflicts
Added boost dependencies and switched to boost vectors