changed the question class
Merge branch 'master' of https://github.com/CMPUT301F14T04/Funtime-Runtime-Project
Merge branch 'master' of https://github.com/CMPUT301F14T04/Funtime-Runtime-Project
Merge branch 'master' of https://github.com/CMPUT301F14T04/Funtime-Runtime-Project
picture is somwhat uploadin, we will have to see though
Merge branch 'master' of https://github.com/CMPUT301F14T04/Funtime-Runtime-Project
Merge branch 'master' of https://github.com/CMPUT301F14T04/Funtime-Runtime-Project
Fixed stuff wiht pictures and whatnot