Changes text
Merge branch 'master' of github.com:alchapone/apppie.org

Conflicts:
	source/index.html.erb
	source/stylesheets/typography.sass
text