Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	docs/installation.md

README.md

@@ -4,6 +4,10 @@
 [![Build Status](https://travis-ci.org/jlowe64/moodle-logstore-xapi.svg?branch=master)](https://travis-ci.org/jlowe64/moodle-logstore-xapi)
 [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/LearningLocker/learninglocker?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
+<<<<<<< HEAD
 - [Installation](https://github.com/jlowe64/moodle-logstore-xapi/blob/master/docs/installation.md)
+=======
+- [For drag and drop Moodle installation](https://github.com/jlowe64/moodle-logstore-xapi/blob/master/docs/installation.md).
+>>>>>>> origin/master
 - [Read documentation](https://github.com/jlowe64/moodle-logstore-xapi/blob/master/docs/readme.md).
 - [Report bugs, enhancements, and questions](https://github.com/jlowe64/moodle-logstore-xapi/blob/master/contributing.md#issue-templates).

docs/installation.md

 You obviously need to have [Moodle](https://moodle.org/) installed first and you need to be logged in as an Admin.
 
-1. Download the plugin. [Click here to download the .zip](../xapi.zip?raw=true).
+1. Download the plugin. [Click here to begin download](../xapi.zip?raw=true).
 2. Go to "http://www.example.com/admin/tool/installaddon/index.php" (replacing “www.example.com” with your own domain).
 3. Drag and drop your download from step 1.
 4. Click "Install plugin from the ZIP file".