Initial setup
Merge branch 'master' of github.com:joshsoftware/overview

Conflicts:
	.gitignore