fixed Makefile
Merge branch 'master' of github.com:poultergiest/cs378-project1
compiling state, temporarily took out papi code, will put in a temp file while reconstructing on cs machine