Merge branch 'master' into layout_redux

Conflicts:
	app/assets/stylesheets/cards.scss.erb
Merge branch 'layout_redux' of https://github.com/ZNCatlaw/LD30 into layout_redux

Conflicts:
	app/assets/stylesheets/cards.scss.erb