"bronte is testing"
"testing again"
Merge branch 'master' of https://github.com/asgh722/Pixlate

Conflicts:
	Web/demo.html