Reorganization/update of test files
Edited .gitignore to ignore DS_Store, and moved new test-files folder from beta over to prevent merge conflicts
Merge beta into master
Fixed the demos