added preliminary edit form
Merge remote-tracking branch 'origin/photo_upload' into v0.1
updated instagram controller and edit form
fixed photo select form w/ instagram
Merge pull request #11 from th7/v0.1

V0.1
fix whitespace conflict