finished HTML/CSS
Resolving conflict
Merge pull request #4 from rickyholtz/fancification

finished HTML/CSS