Merge remote-tracking branch 'origin/master'
Making correct screen show up first
Merge branch 'master' of github.com:sisiwei/gen-hackday-propublica
Merge branch 'master' into gh-pages