fork-001_master
Merge branch 'master' of https://github.com/dnuttle/gitlab into fork-001_master

Conflicts:
	fork.txt
Merge pull request #6 from dannuttle/master

fork-001