Revert "Commit for assignment due to 09-17-2014."

This reverts commit 02e7da7195f810767016f0e38f8a0d09be8d7d39.
Merge remote-tracking branch 'origin/master'

Conflicts:
	oasis_requirements_and_ERD.md