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

Conflicts:
	functions.js
update
update
update
update
update
update
update
time travel
clean job
ng show schools and some text
Merge branch 'master' of https://github.com/HackaBXL/2014_think-of-the-children
update
update