First version
Merge branch 'master' of github.com:chriscampoli/freelancer-affair