premerge
Merge branch 'master' of https://github.com/Haradwaith/Escape-04-2013

* 'master' of https://github.com/Haradwaith/Escape-04-2013:
  Add delete character function
WIP