Updated picFn to display picture after being taken
Finished working for the night, closed all project windows
Merging master