Fixing stuff
Merge branch 'master' of https://github.com/CMPUT301F13T07/Team07Story
Working Page/EditView
;