Merge remote-tracking branch 'James/master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge remote-tracking branch 'James/master'

Conflicts:
	src/index.html
Merge remote-tracking branch 'George/master'
Merge remote-tracking branch 'George/master'
Merge remote-tracking branch 'George/master'
Merge remote-tracking branch 'George/master'
Merge remote-tracking branch 'James/master'
Merge remote-tracking branch 'joshua/master'
Added loaction
Merge remote-tracking branch 'joshua/master'
Merge remote-tracking branch 'George/master'
Fixed merge error

Fixed merge error
Merge remote-tracking branch 'George/master'
Added loaction.js
Merge