Text changes
Merge branch 'master' of github.com:alchapone/apppie.org

Conflicts:
	source/views/faq/index.html.erb