update
Merge pull request #3 from slambooke/dannydanile-master

update to all the code