some changes
Merge remote-tracking branch 'origin/master' into ollie
changes
more changes
commit before Nicerhugs merge
post nh merge
fixed icons
Merge remote-tracking branch 'origin/master' into ollie
commit pre twitter feed add
post twitter feed add
design almost done, needs confirmation
Merge pull request #21 from olliegill/ollie

Ollie