Items 4 & 5
Merge branch 'master' of github.com:bassamjarad/bread

Conflicts:
	index.php