for linda
Merge branch 'master' of https://github.com/Neteshy/icc505-F13