Merge pull request #465 from ericandrewlewis/master

Update licenses text in README file

README.md

@@ -58,11 +58,17 @@ Copyright and License
 
 Copyright 2012 Igor Vaynberg
 
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in
-compliance with the License. You may obtain a copy of the License in the LICENSE file, or at:
+This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU 
+General Public License version 2 (the "GPL License"). You may choose either license to govern your 
+use of this software only upon the condition that you accept all of the terms of either the Apache 
+License or the GPL License. 
+
+You may obtain a copy of the Apache License and the GPL License in the LICENSE file, or at:
 
 http://www.apache.org/licenses/LICENSE-2.0
+http://www.gnu.org/licenses/gpl-2.0.html
 
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed under the Apache License 
+or the GPL Licesnse is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
+either express or implied. See the Apache License and the GPL License for the specific language governing 
+permissions and limitations under the Apache License and the GPL License.