removing @@ references, step 1
use puts to bug hunt
Merge branches 'renderme' and 'master'