stuff
removed unnecessary toast
stuff
Merge branch 'master' of https://github.com/CMPUT301F13T07/Team07Story
some fixes
Merge branch 'master' of https://github.com/CMPUT301F13T07/Team07Story