gitignore added
Added code samples
Added comment
Merge branch 'master' of github.com:ErikHellman/FeatureNotABug

Conflicts:
	.gitignore