Initial commit
String encoding
Merge branch 'master' of https://github.com/sualeh/working

Conflicts:
	.gitignore