qaaaaa
Merge branch 'master' of https://github.com/robsonala/chrome-photobook

Conflicts:
	window.html