updating master branch
Merge branch 'master' of https://github.com/alankalter/TruePhoto into Carlos
trying to push
adding local stuff
Pulling Trevor's latest changes and being lab mouse
commiting new changes?
commitng merge
Made additional adds and deletes to make sure project is on track
commiting
commting bullshit
Pushing god send code
commiting new master
commting godsend master
Merge pull request #6 from alankalter/Carlos

Carlos