proj4 files
Modified the code a bit and how it was printing
Merge remote-tracking branch 'origin/master'

Conflicts:
	buffer.h
	project4a.cpp
modified some of my code: