Updated with {{}}
Updated with {{}}
clean up
clean up
Updated with {{}}
Merge remote-tracking branch 'origin/master'

Conflicts:
	mustache.py
Merge branch 'devel' of https://github.com/Mlnx-GSO/sysinfo-html

Conflicts:
	.gitignore
Merge branch 'devel' of https://github.com/Mlnx-GSO/sysinfo-html

Conflicts:
	.gitignore
testing