Ignore changes in index.html on master
Writeup mysql intro chapter
Merge 'master'