Created Test Environment

I created a test scene so I can work on other things
Merge branch 'Reza'
Nothing

Had to commit to remove conflicts.