resizing now appears to work
display image func works
Merge branch 'twendlan'
Merge branch 'master' of https://github.com/CMPUT391W14TTJ/c391RIS
merged james
' stuff
displaying images now works/working on the links
image links work now
add images
display regular_size
Merge branch 'master' of https://github.com/CMPUT391W14TTJ/c391RIS
Merge branch 'twendlan'
Merge branch 'master' of https://github.com/CMPUT391W14TTJ/c391RIS