First working machine
Merge branch 'master' of https://github.com/wsd1/build_srv
Merge remote change.
Conflicts:
	.gitignore