fiddling with pop'n analysis
Fix conflict.

Merge branch 'master' of github.com:wzhang43/ST-599-Project-2-Group-1

Conflicts:
	MattsNotes/PopnAnalysis.R