Initial Files
Merge branch 'master' of github.com:micahthomas/COSC-1410

Conflicts:
	.gitignore
	README.md