new website design woot
updated links
fixing branch merge conflicts, merging branch with new site