New stuff
The rest
The rest
Test
Commit with -a
Diff between staged and commit
The staging
Commit unstaged changes
Merge branch 'master' of https://github.com/josefsalyer/ABC-Company

Conflicts:
	Readme-text
Merge branch 'master' of https://github.com/josefsalyer/ABC-Company