conniec/Bookcuddle — pull request #3 by conniec (2012-10-15 18:33:43+00:00)
Title: Heroku merge

merge heroku with master