intro update
Merge branch 'finishing' of https://github.com/thunderdomes/Struts into finishing

Conflicts:
	.DS_Store
	melon/melon-Info.plist