Work on CSS and HTML to make things more centered.
Fix merge conflict.
Merge pull request #47 from cassiemoy/master

new css :) :)