Initial commit
Update README.md
Update .gitignore
Merge branch 'master' of github.com:georgeee/homework3

Conflicts:
	.gitignore
	README.md
Merge branch 'master' of github.com:georgeee/Silencio