Initial app commit
Merge branch 'master' of github.com:rharter/CompoundViews

Conflicts:
	.gitignore