Merge pull request #1 from mattgmarcus/PhotoBranch

Photo branch
Set up UI from FromActivity-PayActivity
Delete .gitignore~

Unclear how this got here
yay i did the photo stuff and added rob's stuff
merge conflicts
removed strings, modified photoviewactivity