prelim facility decisions included
Merge branch 'master' of https://github.com/kdhore/orianga-grande

Conflicts:
	.DS_Store