Fixed bug
Resolved merge

Merge branch 'master' into r2_index

Conflicts:
	bread.html
Completed feature branch