first commit
update configuration
Merge branch 'master' of github.com:mrdev/Basic-Configuration

Conflicts:
	.gitignore