thumbnail in answer works
nothing much
merge conflicts
still stuck
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
things dumb people do
thumbnail on question working
thumbnails all working
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
added size checks
Merge pull request #205 from lamorie/master

Thumbnails