Pull user data from database
Resolve merge conflict
Merge branch 'master' of http://github.com/bezi/gitorial