Temp State
Merge branch 'master' of https://github.com/Blackimp/Assignment-3

Conflicts:
	Resources/ui/photo.js
merge