Initial commit
adding my name to README.md
adding trifort to README.md
Merge branch 'master' of https://github.com/rbcompiler/studio-test

Conflicts:
	README.md
adding my name to README.md
Merge pull request #2 from smueller1/master

adding my name to README.md
upload test
Merge pull request #3 from amd86/master

adding my name to README.txt
adding my name to README.md
adding my name to README.md
adding my name to README.md
adding my name to README.md
Merge pull request #4 from newton449/master

adding my name to README.md
Merge branch 'master' of git://github.com/qsahmed/studio-test

Conflicts:
	README.md
Merge git://github.com/hapan/studio-test

Conflicts:
	README.md
 Xiaoyu Yao
adding newlines in readme
adding my name to README.md
adding my name to README.md
Merge branch 'master' of git://github.com/maomaogou/studio-test

Conflicts:
	README.md