added papi functionality to files
Merge branch 'Ben's-Branch'

Conflicts:
	Makefile
	Utilities.h
Removed conflict
Added Ben's main.cpp file
Merge branch 'master' into Ben's-Branch