Alicia

All the html pages are on my branch, so if they look good to you guys then let's merge them to master!