edit7 by zarah
Merge branch 'master' of https://github.com/Zaaraah/quackery

Conflicts:
	app/assets/images/about.png
	app/assets/images/banner.png
	app/assets/images/error.png
	app/assets/images/pinkamoebaleft.png
	app/assets/images/pinkamoebaright.png
	app/assets/images/speechleft.png
	app/assets/images/speechright.png
	app/views/layouts/application.html.erb