Merge branch 'master' of https://github.com/soemirno/hackathon-suriname-2013

# By Presentator (5) and Mambo Workshop (2)
* 'master' of https://github.com/soemirno/hackathon-suriname-2013:
  hot
  new feature
  Revert "back to English"
  revert
  Add CAPITALS
  let's create a merge conflict
  aangepast voor 2014

Conflicts:
	README.md