fixed merge conflict
updated imports
re-added l1cache to project
fixed constructor
working on L2Cache
re-changed enum name