Merge branch 'master' into John-DiBaggio
version as of tuesday april 8 Afternoon

version as of tuesday april 8 Afternoon
Merge branch 'John-DiBaggio'
Merge branch 'master' into Cole-Bittel

Conflicts:
	js/main.js