no idea what this lot is
fixed merge conflicts
added store page and some simple paypal stuff.