"added a second photo"
Merge branch 'master' of https://github.com/asgh722/Pixlate

Conflicts:
	Web/untranslated.html
Merge branch 'master' of https://github.com/asgh722/Pixlate

Conflicts:
	Web/untranslated.html
Merge branch 'master' of https://github.com/asgh722/Pixlate
Merge branch 'master' of https://github.com/asgh722/Pixlate
made translation input box bigger and in a better position
i dont know why this merge is necessary
Merge branch 'master' of https://github.com/asgh722/Pixlate