poty's commit
Merge branch 'master' of https://github.com/SporadicPixels/LookingGlassProject

Conflicts:
	LookingGlass.aslx