Intermediate commit before merge
Merge branch 'master' of https://github.com/logandaniels/hacktothefuture
Added upvoting