testing rollback
added edge detection stuff
Merge branch 'master' of https://github.com/Mellen/Mellen.github.io

Conflicts:
	index.html
	showyourworking/working.js