Highlighted problematic piece
Resolved conflict
Cleaned up terms regarding modified CC license
Merge pull request #4 from localmotors/modified-creative-commons

Modified creative commons