initial commit
resolve conflict
remove old styles
add text shadow
Merge remote-tracking branch 'origin/gh-pages' into gh-pages