New pics
Merge branch 'master' of https://github.com/CaptainGobelin/html5-memo

Conflicts:
	js/generate.js