ignoring everything
Merge branch 'master' of https://github.com/magic-upenn/magic2010
Merge branch 'master' of https://github.com/magic-upenn/magic2010
Merge branch 'master' of https://github.com/magic-upenn/magic2010
Merge branch 'master' of https://github.com/magic-upenn/magic2010