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

....
Merge pull request #19 from eas604/master

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