first commit
Merge https://github.com/xrabohrok/CBC_Proj4

Conflicts:
	.gitignore