Added HTML generator
Flattening branches
Tests all work
Updating git ignore
Merge branch 'niraj'
Everything merged