Git Ignore
Merge branch 'chris' of https://github.com/shanet/Disposable-Apps into berty