first commit
Merge branch 'master' of https://github.com/softwarekitty/cpre489lab4

Conflicts:
	README.md