attempt #1 to merge with dinna and aaron
Merge branch 'master' of https://github.com/paulhyunkim/Play-It-Forward
fixed conflicts