Step 2 Files
Step 2 Files

Conflicts:
	admin/helloworld.php
	helloworld.xml
	site/controller.php
	site/views/helloworld/tmpl/default.php
	site/views/helloworld/view.html.php