MacPro Initial Commit
Spacing and capitalization updates
Handling conflicts
Fixing corrupt files from conflicts
Merge pull request #2 from dschach/master

Update to API 30.0