Added image functionality
Merge branch 'master' of https://github.com/chan95/HackRU-2014