added facebook button
some merge fixes
some merge fixes
Merge branch 'master' of github.com:elpintar/chooseyourown