Cleaned up cache and csapp_lib
Merging...