predictor update
Merge branch 'master' of https://github.com/popacai/prefetcher

Conflicts:
	prefetcher.C
	prefetcher.h