Have generate use the makeimage function
Merge remote-tracking branch 'origin/master'
Indent html