got all view roughly working
made changes to fix conflicts
Merge pull request #13 from dcgudeman/master

Got photo all view roughly working