precompile assets
Merge remote-tracking branch 'origin/master'

merge masters
Merge branch 'master' of https://github.com/caldwelljs/makerpong

more master merges
Merge remote-tracking branch 'origin/master'

more master merge!
Merge remote-tracking branch 'origin'

bad merging
Merge remote-tracking branch 'origin'

fixing the bad merge
add new last game table to dash
add new last game table
Merge remote-tracking branch 'origin'

HUGE MERGing
merging and precompiling
small stuff
fix conflict