Merge pull request #15 from nicklynchjonely/master

update commits
Merge pull request #16 from nicklynchjonely/master

update commits
Merge pull request #17 from nicklynchjonely/master

u
reviewed project schedule
Merge pull request #29 from ddenhart/master

reviewed project schedule