update
Merge branch 'master' of https://github.com/HackaBXL/2014_think-of-the-children

Conflicts:
	functions.js