Merge remote-tracking branch 'origin/change-mix'
Merge branch 'master' of https://github.com/Rahber/pairness.com