removed Gemfile.lock
updated haml and fixed dependencies
Forgot redcarpet for markdown
recompiled with new gems and updated HAML
fixed merge error
fixed the date