Merge pull request #14 from eas604/master

Integration 12-01
Merge pull request #15 from eas604/master

Fingers Crossed
Merge pull request #22 from TEAM2-ISC567-FALL14/master

Cleanup