Merge pull request #26 from mplaza/melabranch

Melabranch
setting up for heroku deployment
Merge branch 'master' into paulbranch
Merge pull request #27 from mplaza/paulbranch

Paulbranch
precompiled assets locally
Merge pull request #28 from mplaza/paulbranch

precompiled assets locally
fixed links
fixed links, now redirects to posts when admin not signed in
Merge pull request #29 from mplaza/paulbranch

Paulbranch
Merge branch 'master' into melabranch
merging with melabranch
Merge pull request #30 from mplaza/paulbranch

merging with melabranch
moving file
Merge branch 'master' into melabranch