Revert "Demo sprint"
Merge pull request #4 from TEAM2-ISC567-FALL14/revert-3-Demo-Sprint

Revert "Demo sprint"