Signed-off-by: timothyosullivan <timothy.osullivan1@gmail.com>
Signed-off-by: timothyosullivan <timothy.osullivan1@gmail.com>
Merge branch 'master' of ssh://git@github.com/timothyosullivan/SimpleProjectScratchPad.git
Merge branch 'master' of ssh://git@github.com/timothyosullivan/SimpleProjectScratchPad.git
Signed-off-by: timothyosullivan <timothy.osullivan1@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloWorld/src/com/ucc/simpleproject/HelloWorld.java