first draft of base site
Merge branch 'master' of https://github.com/shanricciardi/base

Conflicts:
	.gitignore