Converted README HTML to markdown
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing

Conflicts:
	README.md
Resolving merge conflict