Conflict phase 2

Signed-off-by: alex <ahernandezsis@unm.edu>
conflict in sayNever resolved


Conflicts:
	Demo/src/HelloWorld.java

Signed-off-by: alex <ahernandezsis@unm.edu>