Shits cleaned
Merge branch 'master' of https://github.com/PPerfect/PicturePerfect

Conflicts:
	scripts/view.js