some stuff was moved so things will work better I think
fixed a out of sync issue
project now includes the most recent files from every branch
updated package names
removed test files because they just need to be redone one at a time.
IT COMPILES, DON'T MESS THIS SHIT UP
Merge pull request #12 from cs27x/MingYangPlayTest

fast-forward merge