change
Merge branch 'master' of
https://github.com/TeamBaLaLe/BaLaLe_Moc_Project.git

Conflicts:
	HelloWorld/src/com/example/helloworld/HelloWorld.java