update with markup
Merge branch 'master' of https://github.com/bootcamp2-10/bootcamp2-10.github.io

Conflicts:
	README.md