updating master branch
Merge branch 'master' of https://github.com/alankalter/TruePhoto into Carlos
trying to push
adding local stuff
add photohub
Merge branch 'master' of https://github.com/alankalter/TruePhoto.git
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
add broadcaster and implemented photohub
commting bullshit
Delete web.config
merge
Pushing god send code
api controllers1
Merge pull request #3 from alankalter/peterC

basic changes to UI
go
merge hell