First commit
Merge branch 'master' of https://github.com/eemihauk/str-info-assignment

Conflicts:
	.gitignore