initial commit
Merge branch 'master' of github.com:swbain/csc4610-acme-auto-auto-test

Conflicts:
	.gitignore