Merge pull request #26 from TEAM2-ISC567-FALL14/master

More tweaks
Fixing course outcome window size YET AGAIN
Merge pull request #20 from eas604/master

Tweaks