Initial commit
Merge remote-tracking branch 'GitHub_net14-1/master'

Conflicts:
	.gitignore