camera changes
Merge branch 'reza' of https://github.com/tsob/swirl into reza
latest reza changes
merging with reza branch
Merge branch 'tim' of https://github.com/tsob/swirl into tim