let's create a merge conflict
Merge branch 'master' of https://github.com/soemirno/hackathon-suriname-2013

# By Mambo Workshop
# Via Mambo Workshop
* 'master' of https://github.com/soemirno/hackathon-suriname-2013:
  Add CAPITALS

Conflicts:
	README.md