Moved @end into header
Photo upload.
Merge branch 'master' into nick-new
Merge pull request #29 from Gatzy118/nick-new

Nick new