adding gitignore
Merge branch 'master' of https://github.com/araju/maslab-2014