Merge with Diana version
Merge with Diana's code
Fixed jade errors.
Added procfile for heroku.
Fixed proc file.
Added badges in public/assets.