Merge branch 'master' of github.com:peggy-li/hackblue
Fixed merge conflict, updated tagline