changed activity lifespan
Merge branch 'm9' of github.com:CS2340/BankNote into m9
See Cameron.