iwillcode/awesomeandroid — pull request #2 by vvallabb (2014-10-18 22:27:29+00:00)
Title: simple text size and all caps to demo merge conflict

demoing merge conflict and pull request