Added the Up Carpet on the action bar icon (Not functional)
Merge branch 'master' of github.com:CMPUT301F14T04/Funtime-Runtime-Project