background
fixed conflicts
ajax reddit and some styling...
fixed conflicts
Merge pull request #26 from lizkline91/master

ajax.. we don't have to use it if you guys don't want to.
fixed merge error in index.html.haml