first commit
deleteMerge branch 'master' of github.com:chrischang12/wolfpack

Conflicts:
	.gitignore