changed over completely
Merge pull request #1 from ukapu/master

changed site over totally to new site (not completely done though)