Merge branch 'master' of git://github.com/ifarup/tc1-82

Adding some mac-related files to the .gitignore file
Merge branch 'master' of git://github.com/ifarup/tc1-82

Web app
Merge branch 'master' of git://github.com/ifarup/tc1-82
no message