my first commit
first commit
Merge branch 'master' of https://github.com/Seraph63/symphony-project

Conflicts:
	README.md

	deleted:    readme.md