in progress updates for merge
authorSeth Woodworth <seth@sethish.com>
Wed, 4 Jan 2012 04:59:36 +0000 (23:59 -0500)
committerSeth Woodworth <seth@sethish.com>
Wed, 4 Jan 2012 04:59:36 +0000 (23:59 -0500)
commit1e222b025173b904b75314809fd104bbffdf558e
tree5fc39540741ad17fd405f3220e61d05c143fb933
parenta9951acf4c9898d16eeab563fe9bafe0b00b9801
in progress updates for merge
app.js
public/index.html
public/javascripts/main.js