git ignore file update
Merge branch 'master' of https://github.com/Schosser/MasterLabProject09_2013
small changes in gitignore