Edits 2
Edit 3
Edits 4
Merge branch 'master' of https://github.com/jeva33/bloc-01

Conflicts:
	Bloc-01.txt