update 111213
gitignore update
update 111813
Merge pull request #52 from delorenzana/master

update 111813