joomla v1.0
Merge branch 'master' of https://github.com/dench0/faq

Conflicts:
	index.html
joomlav2