Squashed 'moduleA/' content from commit e1cfe33

git-subtree-dir: moduleA
git-subtree-split: e1cfe33a479863da419f635bd272340fdeeb9b30
Merge commit '0fd024797f783bd86c0a229553531ad3a51c819b' as 'moduleA'
added newProjectCode.txt
change made to shared module from project1
Merge commit '2ee8df2017a731bb5145b8be5ca48ee129866e80'
Squashed 'moduleA/' changes from e1cfe33..dee044e

dee044e change made to shared module from project1

git-subtree-dir: moduleA
git-subtree-split: dee044ed55b19fbc8f095d9300a93b876b034c36
testing new code from project 1
Merge branch 'master' of https://github.com/chrishonson/project1
Merge commit '2ce9daacd5eb3c56ca9a5737422191867d6ffdd8'
Squashed 'moduleA/' changes from dee044e..c8352b4

c8352b4 shared module update

git-subtree-dir: moduleA
git-subtree-split: c8352b4e4c3e4eb520301b3222bf09464c8cab9d
adding conflict to project1
Squashed 'moduleA/' changes from c8352b4..9cb8d57

9cb8d57 creating conflict from moduleA
fa9f812 Merge commit '2ce9daacd5eb3c56ca9a5737422191867d6ffdd8'
32a6a2a testing new code from project 1

git-subtree-dir: moduleA
git-subtree-split: 9cb8d5764f7f17ff149b5b17927db5e6c4a26dd9
Merge commit '30d89275c5c905169574555863ca4a41c8b4dabb'

Conflicts:
	moduleA/newSharedModuleCode.txt