initializing repo
wordpress blog
adds site files from zip
simon
fucking around
da
Merge branch 'master' of github.com:chrislukic/sandpiper
gitignore
Merge branch 'master' of github.com:chrislukic/sandpiper

Conflicts:
	x-sandpiper-services.htm
	x-sandpiper.htm
renames folders
renames index