[Panda] Commit before merge.
[Panda] Commit before merge.
Merge branch 'master' of github.com:stpddream/whoisgoingtodc

Conflicts:
	app/controllers/static_pages_controller.rb
	db/schema.rb