Merge branch 'master' of github.com:flimshaw/charliehoey.com
yep, let's do it Merge branch 'master' of github.com:flimshaw/charliehoey.com
updated a few things, about to add some animations