language
Merge branch 'master' of github.com:thomasgallagher/learn-pledge-challenge

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'master' of github.com:thomasgallagher/learn-pledge-challenge

Conflicts:
	app/views/pledges/new.html.erb