fix merge conflict
authorchapel <jacob.chapel@gmail.com>
Mon, 14 Nov 2011 23:44:11 +0000 (15:44 -0800)
committerchapel <jacob.chapel@gmail.com>
Mon, 14 Nov 2011 23:44:11 +0000 (15:44 -0800)
commit516e1abc44f72d556e22b66b8b292e4a83e16518
treec607c1202a0d73556bfdd6e57728a4a95ae2694c
parent81e7efee4cb644bfe5906c9019be9aa6d6370235
parent0926c8c160c432afbf8a11e04e0580326e8d6f1d
fix merge conflict
app.js