added test.cpp
added a string
added punctuation
Merge branch 'master' of http://github.com/Xecantur/test into add_a_string

Conflicts:
	test.cpp
Merge pull request #1 from MastodonHQ/add_a_string

Add a string (MastodonHQ)