solving merge conflict
Merge branch 'master' of github.com:CMPUT301F14T04/Funtime-Runtime-Project
Merge branch 'master' of github.com:CMPUT301F14T04/Funtime-Runtime-Project
Merge branch 'master' of github.com:CMPUT301F14T04/Funtime-Runtime-Project
added search button icon
Merge branch 'master' of github.com:CMPUT301F14T04/Funtime-Runtime-Project