update .gitignore
edit .gitignore
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc
Merge branch 'master' of github.com:stephenchapman/sc