working in two directories not sure what is being merged as usual
working in two directories not sure what is being merged as usual

Merge branch 'master' of github.com:mkness/TheCannon

mkness/TheCannon,mkness/TheCannon