Merge pull request #6 from eas604/master

Pulling for week 2
Merge pull request #7 from eas604/master

Pulling update
update for week 10-31
Merge pull request #12 from TEAM2-ISC567-FALL14/master

10-31 update from Team 2