Add Week 9 content
Update Week 9 content based on feedback from Susan.
Merge pull request #34 from sadleb/week9

Update Week 9 content based on feedback from Susan.
Add Week 10 content
Merge pull request #35 from sadleb/week10

Adds Week 10 content to current college website
Merge branch 'adamdruppe-devise' into staging
Merge branch 'staging' of https://github.com/beyond-z/beyondz-platform into staging
Merge pull request #129 from adamdruppe/recruitment

twitter button
Made lots of page tweaks and set video so that it will stop when the modal closes.
Merge pull request #130 from bgrayless/apply_page_tweaks

Apply page tweaks pre-release.
New Aimee photo.
Merge pull request #131 from bgrayless/new_aimee_photo

New Aimee photo
Merge pull request #132 from adamdruppe/recruitment

Welcome/confirmation tweaks
Merge pull request #133 from adamdruppe/recruitment

class of for quotes
Merge branch 'staging' of https://github.com/beyond-z/beyondz-platform into staging
Update the email host configuration to read from an ENV variable so we can have a staging environment that matches production, but whose emails configuration can be customized for that server
Merge pull request #134 from sadleb/mailer-config

Update the configuration of the production mailer
Merge branch 'staging'

Conflicts:
	app/assets/stylesheets/base/_global_design.css.scss
	app/views/assignments/presentation-rehearsal.html.erb
	config/routes.rb
Make sign up select fields have empty defaults AND make them have Bootstrap styling.
Merge pull request #137 from bgrayless/set_sign_up_selects_to_empty_default

Signup form improvements