made the buttons look well
Merge branches 'master' and 'dev'
Merge branches 'heroku' and 'master' into heroku
added some meta tags
Merge branches 'master' and 'dev'
Merge branches 'heroku' and 'master' into heroku