Merge with local. Fixed Makefile. Removed "All Files".