Ross' task list
Merge branch 'ProtocolWednesday' of https://github.com/appiphony/Phillips into ProtocolWednesday

Conflicts:
	js/stanleysJS.js