Changes.
Committing changes post working with Boaz, without yet pulling Boaz's stuff. Hoping to update project after this,
Committing changes post working with Boaz, without yet pulling Boaz's stuff. Hoping to update project after this,
Merge remote-tracking branch 'origin/origin2' into origin2

Conflicts:
	app/views/static_pages/home.html.erb
Committing the fixed integration.