Import source code
Merge branch 'master' of heroku.com:immense-citadel-3888

Conflicts:
	config/secrets.yml