...
Merge branch 'master' of https://github.com/denzildoyle/codebloxs

Conflicts:
	.DS_Store
	image/.DS_Store