about us images push
Merge branch 'master' of https://github.com/cranberryofdoom/wislr

Conflicts:
	app/views/policies/community.html.erb