Revert "Demo sprint"

Reverts TEAM2-ISC567-FALL14/ISC567Fall2014#3