Updated Buffer
Merge branch 'master' of https://github.com/benring/cs437-2

Conflicts:
	buffer.c
	buffer.h