Initial express skeleton - no useful functionality
Merge branch 'master' of github.com:jeremythornton/wine-trek

Conflicts:
	.gitignore