prepping to integrate Sam's stuff
Merge branch 'master' of https://github.com/tsquared89/future
played around with making a new page, no real edits.
trying to push...