both data working. styling almost complete
Merge remote-tracking branch 'origin/gh-pages'