still working
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
still broke
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
stuff has begun to work, YAY
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
Thumbnail working finally
Merge conflicts
Merge pull request #198 from lamorie/master

Thumbnail numero uno...finally