test commit
Merge branch 'master' of github.com:yuethomas/fuel

Conflicts:
	fuel/templates/faq.html