Update README.md
Created Apache License Version 2.0

Maybe add a license to this project, just to reaffirm our choice to have it open source.
Fixed a merge conflict
Merge branch 'master' of https://github.com/ScottSpittle/shuprogramming into ScottSpittle-master