Title has been added
Conflict resolved
Conflict resolved
Merge branch 'master' of github.com:7bits/old-2013