updates to new branch
Tasks 4 and 5 complete
Task 6
Update
Ben's Updates
Merge pull request #1 from cmthomison/Nov3

Nov3- Updates before meeting with Ben on 2014_11_06