committed A
added file B & C
modified A
modified B & C
Merge branch 'master' of github.com:webdev-adec/jun