Final working

Final working
Merge branch 'master' of https://github.com/violetzie/Moodgen

Conflicts:
	index.html
	js/flckr.js