normal state of affairs
initial?
Merge branch 'master' of github.com:yalestar/mini_cc

Conflicts:
	.gitignore