yardman Merge branch 'master' of https://github.com/Leotis/olpc-datavisualiza…
4e36715 Jan 7, 2014
Merge branch 'master' of https://github.com/Leotis/olpc-datavisualiza… 
…tion-

Conflicts:
	.gitignore
	LICENSE
4e36715