Added final mockup image
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard into KimWork
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard into KimWork
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard into KimWork
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard into KimWork
Added preliminary J-unit test for search activity view
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard into KimWork
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard into KimWork
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard into KimWork