Merge pull request #1 from JoshuaNotowitz/master

Changes to app.rb file
adding yoyoyo to line 1
whatever
Merge pull request #3 from lessin/master

whatever
fixed changes to app.rb file