Just making sure everything has been merged correctly.
Added documentation, rough draft.
Merge branch 'testing'

Conflicts:
	documentation/documentation.txt