Merge pull request #1 from thatistest/developer

Update .gitignore, request Merge
add Information txt file
Merge pull request #2 from cn15120/master

update resource