oopsy
Update setup.md
Update setup.md
Update installation.md
Merge branch 'development'

Conflicts:
	setup/setup.md