Completed work on Blocks

May need to edit particular "block type" info in the future
Merge branch 'master' of https://github.com/SeniorProjects-CS-Illinois/documentation

Conflicts:
	favorites.html